diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index e35f491db79..3f8557366c6 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -42,7 +42,7 @@ docs lint: extends: - .default-retry - .docs:rules:docs-lint - image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint:vale-2.3.3-markdownlint-0.23.2" + image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint:vale-2.3.4-markdownlint-0.23.2" stage: test needs: [] allow_failure: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e85eb1bfd2d..829e5b8b8ee 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -702,7 +702,6 @@ Rails/SaveBang: - 'ee/spec/models/approval_project_rule_spec.rb' - 'ee/spec/models/approval_state_spec.rb' - 'ee/spec/models/burndown_spec.rb' - - 'ee/spec/models/ci/build_spec.rb' - 'ee/spec/models/ci/pipeline_spec.rb' - 'ee/spec/models/ci/subscriptions/project_spec.rb' - 'ee/spec/models/concerns/approver_migrate_hook_spec.rb' @@ -793,9 +792,6 @@ Rails/SaveBang: - 'ee/spec/services/groups/autocomplete_service_spec.rb' - 'ee/spec/services/ldap_group_reset_service_spec.rb' - 'ee/spec/services/lfs/unlock_file_service_spec.rb' - - 'ee/spec/services/merge_requests/approval_service_spec.rb' - - 'ee/spec/services/merge_requests/remove_approval_service_spec.rb' - - 'ee/spec/services/merge_requests/update_blocks_service_spec.rb' - 'ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb' - 'ee/spec/services/quick_actions/interpret_service_spec.rb' - 'ee/spec/services/slash_commands/global_slack_handler_spec.rb' @@ -1051,14 +1047,6 @@ Rails/SaveBang: - 'spec/models/appearance_spec.rb' - 'spec/models/application_record_spec.rb' - 'spec/models/application_setting_spec.rb' - - 'spec/models/ci/build_metadata_spec.rb' - - 'spec/models/ci/build_spec.rb' - - 'spec/models/ci/build_trace_chunk_spec.rb' - - 'spec/models/ci/instance_variable_spec.rb' - - 'spec/models/ci/legacy_stage_spec.rb' - - 'spec/models/ci/persistent_ref_spec.rb' - - 'spec/models/ci/pipeline_spec.rb' - - 'spec/models/ci/runner_spec.rb' - 'spec/models/clusters/applications/helm_spec.rb' - 'spec/models/commit_spec.rb' - 'spec/models/commit_status_spec.rb' @@ -1181,14 +1169,6 @@ Rails/SaveBang: - 'spec/services/issuable/clone/attributes_rewriter_spec.rb' - 'spec/services/issuable/common_system_notes_service_spec.rb' - 'spec/services/labels/promote_service_spec.rb' - - 'spec/services/members/destroy_service_spec.rb' - - 'spec/services/merge_requests/build_service_spec.rb' - - 'spec/services/merge_requests/conflicts/list_service_spec.rb' - - 'spec/services/merge_requests/create_service_spec.rb' - - 'spec/services/merge_requests/merge_service_spec.rb' - - 'spec/services/merge_requests/post_merge_service_spec.rb' - - 'spec/services/merge_requests/refresh_service_spec.rb' - - 'spec/services/merge_requests/update_service_spec.rb' - 'spec/services/milestones/destroy_service_spec.rb' - 'spec/services/milestones/promote_service_spec.rb' - 'spec/services/milestones/transfer_service_spec.rb' diff --git a/Gemfile b/Gemfile index 337c8063f39..2ef351ed4b0 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' gem 'grape-path-helpers', '~> 1.3' -gem 'faraday', '~> 0.12' +gem 'faraday', '~> 1.0' gem 'marginalia', '~> 1.9.0' # Authentication libraries @@ -119,7 +119,7 @@ gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 0.8', require: false +gem 'gitlab-fog-azure-rm', '~> 0.9', require: false # for Google storage gem 'google-api-client', '~> 0.33' @@ -133,7 +133,7 @@ gem 'seed-fu', '~> 2.3.7' # Search gem 'elasticsearch-model', '~> 6.1' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' -gem 'elasticsearch-api', '~> 6.8' +gem 'elasticsearch-api', '~> 6.8.2' gem 'aws-sdk-core', '~> 3' gem 'aws-sdk-cloudformation', '~> 1' gem 'aws-sdk-s3', '~> 1' @@ -249,9 +249,7 @@ gem 'slack-messenger', '~> 2.3.3' gem 'hangouts-chat', '~> 0.0.5' # Asana integration -# asana 0.10.1 needs faraday 1.0 -# https://gitlab.com/gitlab-org/gitlab/-/issues/224296 -gem 'asana', '0.10.0' +gem 'asana', '0.10.2' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -304,7 +302,7 @@ gem "gitlab-license", "~> 1.0" gem 'rack-attack', '~> 6.3.0' # Sentry integration -gem 'sentry-raven', '~> 2.9' +gem 'sentry-raven', '~> 3.0' gem 'premailer-rails', '~> 1.10.3' @@ -337,7 +335,7 @@ end group :development do gem 'brakeman', '~> 4.2', require: false - gem 'danger', '~> 6.0', require: false + gem 'danger', '~> 8.0', require: false gem 'letter_opener_web', '~> 1.3.4' diff --git a/Gemfile.lock b/Gemfile.lock index fcd5be4afe6..3ea1cb62f4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,9 +77,9 @@ GEM apollo_upload_server (2.0.2) graphql (>= 1.8) rails (>= 4.2) - asana (0.10.0) - faraday (~> 0.9) - faraday_middleware (~> 0.9) + asana (0.10.2) + faraday (~> 1.0) + faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.4) asciidoctor (2.0.10) @@ -114,15 +114,13 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.2.1) aws-eventstream (~> 1, >= 1.0.2) - azure-core (0.1.15) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) - azure-storage (0.15.0.preview) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6, >= 1.6.8) + azure-storage-blob (2.0.0) + azure-storage-common (~> 2.0) + nokogiri (~> 1.10.4) + azure-storage-common (2.0.1) + faraday (~> 1.0) + faraday_middleware (~> 1.0.0.rc1) + nokogiri (~> 1.10.4) babosa (1.0.2) base32 (0.3.2) batch-loader (1.4.0) @@ -206,15 +204,15 @@ GEM css_parser (1.7.0) addressable daemons (1.2.6) - danger (6.0.9) + danger (8.0.5) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (~> 0.9) + faraday (>= 0.9.0, < 2.0) faraday-http-cache (~> 2.0) - git (~> 1.5) - kramdown (~> 2.0) + git (~> 1.7) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix octokit (~> 4.7) @@ -290,18 +288,18 @@ GEM ecma-re-validator (0.2.1) regexp_parser (~> 1.2) ed25519 (1.2.4) - elasticsearch (6.8.0) - elasticsearch-api (= 6.8.0) - elasticsearch-transport (= 6.8.0) - elasticsearch-api (6.8.0) + elasticsearch (6.8.2) + elasticsearch-api (= 6.8.2) + elasticsearch-transport (= 6.8.2) + elasticsearch-api (6.8.2) multi_json - elasticsearch-model (6.1.0) + elasticsearch-model (6.1.1) activesupport (> 3) - elasticsearch (> 1) + elasticsearch (~> 6) hashie - elasticsearch-rails (6.1.0) - elasticsearch-transport (6.8.0) - faraday + elasticsearch-rails (6.1.1) + elasticsearch-transport (6.8.2) + faraday (~> 1) multi_json email_reply_trimmer (0.1.6) email_spec (2.2.0) @@ -326,15 +324,15 @@ GEM factory_bot_rails (5.1.0) factory_bot (~> 5.1.0) railties (>= 4.2.0) - faraday (0.17.3) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) http-cookie (~> 1.0.0) - faraday-http-cache (2.0.0) - faraday (~> 0.8) - faraday_middleware (0.14.0) - faraday (>= 0.7.4, < 1.0) + faraday-http-cache (2.2.0) + faraday (>= 0.8) + faraday_middleware (1.0.0) + faraday (~> 1.0) faraday_middleware-aws-sigv4 (0.3.0) aws-sigv4 (~> 1.0) faraday (>= 0.15) @@ -419,14 +417,16 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - git (1.5.0) + git (1.7.0) + rchardet (~> 1.8) gitaly (13.3.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-fog-azure-rm (0.8.1) - azure-storage (~> 0.15.0.preview) + gitlab-fog-azure-rm (0.9.0) + azure-storage-blob (~> 2.0) + azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types @@ -915,6 +915,7 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) + rchardet (1.8.0) rdoc (6.1.2) re2 (1.2.0) recaptcha (4.13.1) @@ -1067,8 +1068,8 @@ GEM selenium-webdriver (3.142.6) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sentry-raven (2.9.0) - faraday (>= 0.7.6, < 1.0) + sentry-raven (3.0.4) + faraday (>= 1.0) settingslogic (2.0.9) sexp_processor (4.12.0) shellany (0.0.1) @@ -1245,7 +1246,7 @@ DEPENDENCIES addressable (~> 2.7) akismet (~> 3.0) apollo_upload_server (~> 2.0.2) - asana (= 0.10.0) + asana (= 0.10.2) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) asciidoctor-plantuml (~> 0.0.12) @@ -1278,7 +1279,7 @@ DEPENDENCIES connection_pool (~> 2.0) countries (~> 3.0) creole (~> 0.5.0) - danger (~> 6.0) + danger (~> 8.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) default_value_for (~> 3.3.0) @@ -1292,7 +1293,7 @@ DEPENDENCIES doorkeeper (~> 5.3.0) doorkeeper-openid_connect (~> 1.7.4) ed25519 (~> 1.2) - elasticsearch-api (~> 6.8) + elasticsearch-api (~> 6.8.2) elasticsearch-model (~> 6.1) elasticsearch-rails (~> 6.1) email_reply_trimmer (~> 0.1) @@ -1300,7 +1301,7 @@ DEPENDENCIES erubi (~> 1.9.0) escape_utils (~> 1.1) factory_bot_rails (~> 5.1.0) - faraday (~> 0.12) + faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank ffaker (~> 2.10) @@ -1325,7 +1326,7 @@ DEPENDENCIES gitaly (~> 13.3.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-fog-azure-rm (~> 0.8) + gitlab-fog-azure-rm (~> 0.9) gitlab-labkit (= 0.12.1) gitlab-license (~> 1.0) gitlab-mail_room (~> 0.0.6) @@ -1464,7 +1465,7 @@ DEPENDENCIES scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) - sentry-raven (~> 2.9) + sentry-raven (~> 3.0) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) sidekiq (~> 5.2.7) diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.vue b/app/assets/javascripts/commit/pipelines/pipelines_table.vue index 260953af286..2f4118c1717 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.vue +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.vue @@ -247,7 +247,7 @@ export default { }}

{{ s__('Pipelines|More Information') }} diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue index 95153db5af8..32b0121f6da 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue @@ -1,8 +1,11 @@