From cf24d183b3f71f091a02f12b211f3001be5b5085 Mon Sep 17 00:00:00 2001
From: GitLab Bot
Date: Mon, 7 Sep 2020 15:09:04 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master
---
.gitlab/ci/docs.gitlab-ci.yml | 2 +-
.rubocop_todo.yml | 20 -----
Gemfile | 14 ++-
Gemfile.lock | 87 ++++++++++---------
.../commit/pipelines/pipelines_table.vue | 2 +-
.../labels_select/dropdown_create_label.vue | 14 +--
.../stylesheets/fontawesome_custom.scss | 16 ----
.../stylesheets/framework/dropdowns.scss | 7 +-
.../stylesheets/framework/variables.scss | 16 ++++
.../page_bundles/_ide_monaco_overrides.scss | 16 +---
app/assets/stylesheets/pages/issuable.scss | 5 --
app/helpers/dropdowns_helper.rb | 4 +-
app/helpers/projects_helper.rb | 2 +-
app/presenters/clusters/cluster_presenter.rb | 2 +-
.../application_settings/_ci_cd.html.haml | 4 +-
.../application_settings/_usage.html.haml | 4 +-
.../clusters/clusters/aws/_new.html.haml | 2 +-
.../groups/settings/ci_cd/_form.html.haml | 2 +-
app/views/help/_shortcuts.html.haml | 18 ++--
.../profiles/two_factor_auths/show.html.haml | 2 +-
.../projects/merge_requests/_widget.html.haml | 2 +-
.../mirrors/_mirror_repos_push.html.haml | 2 +-
.../settings/ci_cd/_autodevops_form.html.haml | 4 +-
.../projects/settings/ci_cd/_form.html.haml | 2 +-
.../shared/empty_states/_issues.html.haml | 2 +-
app/views/shared/issuable/_form.html.haml | 2 +-
.../sherlock/file_samples/show.html.haml | 2 +-
app/views/sherlock/queries/show.html.haml | 2 +-
.../sherlock/transactions/show.html.haml | 2 +-
.../216491-monaco-diff-selection.yml | 5 ++
...rrow-icons-with-gitlab-svg-arrow-icons.yml | 5 ++
...app-views-shared-issuable-_form-html-h.yml | 5 ++
...app-views-profiles-two_factor_auths-sh.yml | 5 ++
...502-fix-always-visible-sidebar-spinner.yml | 5 ++
changelogs/unreleased/rails-save-bang-19.yml | 5 ++
changelogs/unreleased/rails-save-bang-24.yml | 5 ++
.../sh-update-faraday-and-other-gems.yml | 5 ++
data/whats_new/202008180001_12_10.yml | 2 +-
doc/administration/audit_events.md | 6 +-
.../auth/ldap/google_secure_ldap.md | 2 +-
doc/administration/auth/ldap/index.md | 16 ++--
.../auth/ldap/ldap-troubleshooting.md | 58 ++++++-------
doc/administration/compliance.md | 8 +-
doc/administration/database_load_balancing.md | 2 +-
.../geo/disaster_recovery/index.md | 21 +++++
.../geo/replication/datatypes.md | 2 +-
.../geo/replication/object_storage.md | 2 +-
doc/administration/incoming_email.md | 4 +-
doc/administration/index.md | 6 +-
doc/administration/instance_limits.md | 4 +-
doc/administration/job_artifacts.md | 2 +-
.../gitlab_self_monitoring_project/index.md | 6 +-
doc/administration/object_storage.md | 4 +-
doc/administration/pages/source.md | 2 +-
doc/administration/raketasks/ldap.md | 4 +-
.../raketasks/uploads/migrate.md | 18 +---
.../reference_architectures/10k_users.md | 4 +-
.../reference_architectures/1k_users.md | 2 +-
.../reference_architectures/25k_users.md | 4 +-
.../reference_architectures/2k_users.md | 4 +-
.../reference_architectures/3k_users.md | 4 +-
.../reference_architectures/50k_users.md | 4 +-
.../reference_architectures/5k_users.md | 4 +-
.../reference_architectures/index.md | 12 +--
doc/analytics/README.md | 4 +-
doc/api/audit_events.md | 6 +-
doc/api/epic_links.md | 2 +-
doc/api/groups.md | 10 +--
doc/api/job_artifacts.md | 4 +-
doc/api/project_templates.md | 2 +-
doc/api/projects.md | 6 +-
doc/api/protected_branches.md | 2 +-
doc/api/remote_mirrors.md | 2 +-
doc/api/users.md | 2 +-
doc/api/visual_review_discussions.md | 2 +-
.../bitbucket_integration.md | 2 +-
.../github_integration.md | 4 +-
doc/ci/directed_acyclic_graph/index.md | 2 +-
.../pipelines_for_merged_results/index.md | 2 +-
.../merge_trains/index.md | 4 +-
doc/ci/metrics_reports.md | 2 +-
doc/ci/migration/jenkins.md | 2 +-
doc/ci/pipelines/index.md | 4 +-
doc/ci/pipelines/job_artifacts.md | 4 +-
doc/ci/pipelines/settings.md | 2 +-
doc/ci/quick_start/README.md | 2 +-
doc/ci/runners/README.md | 2 +-
doc/ci/unit_test_reports.md | 2 +-
doc/ci/variables/README.md | 4 +-
doc/ci/yaml/README.md | 31 ++++---
doc/development/approval_rules.md | 2 +-
doc/development/cicd/index.md | 2 +-
doc/development/code_review.md | 4 +-
.../contributing/issue_workflow.md | 4 +-
doc/development/documentation/workflow.md | 2 +-
doc/development/elasticsearch.md | 2 +-
.../secure_partner_integration.md | 6 +-
doc/development/repository_mirroring.md | 2 +-
doc/getting-started/subscription.md | 2 +-
doc/gitlab-basics/create-project.md | 2 +-
doc/install/azure/index.md | 2 +-
doc/integration/kerberos.md | 2 +-
.../incident_management/incidents.md | 4 +-
doc/operations/index.md | 2 +-
doc/operations/metrics/alerts.md | 2 +-
doc/operations/metrics/index.md | 2 +-
doc/push_rules/push_rules.md | 2 +-
.../application_development_platform/index.md | 8 +-
doc/topics/autodevops/customize.md | 6 +-
doc/topics/autodevops/index.md | 24 ++---
doc/topics/autodevops/quick_start_guide.md | 16 ++--
.../admin_area/analytics/dev_ops_report.md | 4 +-
doc/user/admin_area/index.md | 2 +-
.../settings/account_and_limit_settings.md | 2 +-
doc/user/admin_area/settings/index.md | 8 +-
.../visibility_and_access_controls.md | 4 +-
doc/user/analytics/value_stream_analytics.md | 2 +-
.../container_scanning/index.md | 4 +-
doc/user/application_security/dast/index.md | 6 +-
.../dependency_scanning/index.md | 4 +-
doc/user/application_security/index.md | 12 +--
doc/user/application_security/sast/index.md | 16 ++--
.../secret_detection/index.md | 4 +-
.../compliance/license_compliance/index.md | 4 +-
doc/user/discussions/index.md | 2 +-
doc/user/gitlab_com/index.md | 4 +-
doc/user/group/clusters/index.md | 2 +-
doc/user/group/epics/index.md | 10 +--
doc/user/group/index.md | 12 +--
doc/user/group/iterations/index.md | 4 +-
.../group/saml_sso/group_managed_accounts.md | 2 +-
doc/user/group/saml_sso/index.md | 8 +-
doc/user/permissions.md | 8 +-
doc/user/profile/personal_access_tokens.md | 6 +-
doc/user/project/clusters/index.md | 4 +-
doc/user/project/code_owners.md | 8 +-
doc/user/project/file_lock.md | 2 +-
doc/user/project/index.md | 2 +-
doc/user/project/issue_board.md | 8 +-
doc/user/project/issues/design_management.md | 2 +-
doc/user/project/issues/index.md | 4 +-
.../project/issues/issue_data_and_actions.md | 10 +--
.../browser_performance_testing.md | 4 +-
.../project/merge_requests/code_quality.md | 2 +-
.../project/merge_requests/getting_started.md | 2 +-
.../load_performance_testing.md | 4 +-
.../merge_requests/merge_request_approvals.md | 8 +-
.../reviewing_and_managing_merge_requests.md | 4 +-
.../merge_requests/squash_and_merge.md | 2 +-
doc/user/project/milestones/index.md | 6 +-
.../project/new_ci_build_permissions_model.md | 4 +-
doc/user/project/releases/index.md | 4 +-
doc/user/project/repository/branches/index.md | 2 +-
.../reducing_the_repo_size_using_git.md | 2 +-
.../repository/repository_mirroring.md | 18 ++--
doc/user/project/requirements/index.md | 2 +-
doc/user/project/settings/index.md | 6 +-
doc/user/project/web_ide/index.md | 2 +-
doc/user/project/wiki/index.md | 2 +-
doc/user/search/index.md | 2 +-
haml_lint/linter/documentation_links.rb | 2 +-
lib/system_check/app/redis_version_check.rb | 2 +-
locale/gitlab.pot | 3 +
spec/controllers/invites_controller_spec.rb | 72 ++++++---------
.../components/settings_panel_spec.js | 2 +-
.../dropdown_create_label_spec.js | 2 +-
spec/models/ci/build_metadata_spec.rb | 2 +-
spec/models/ci/build_spec.rb | 60 ++++++-------
spec/models/ci/build_trace_chunk_spec.rb | 4 +-
spec/models/ci/instance_variable_spec.rb | 6 +-
spec/models/ci/legacy_stage_spec.rb | 2 +-
spec/models/ci/persistent_ref_spec.rb | 8 +-
spec/models/ci/pipeline_spec.rb | 12 +--
spec/models/ci/runner_spec.rb | 6 +-
.../clusters/cluster_presenter_spec.rb | 2 +-
spec/services/members/destroy_service_spec.rb | 4 +-
.../merge_requests/build_service_spec.rb | 2 +-
.../conflicts/list_service_spec.rb | 2 +-
.../merge_requests/create_service_spec.rb | 4 +-
.../merge_requests/merge_service_spec.rb | 8 +-
.../merge_requests/post_merge_service_spec.rb | 2 +-
.../merge_requests/refresh_service_spec.rb | 2 +-
.../merge_requests/update_service_spec.rb | 8 +-
183 files changed, 589 insertions(+), 589 deletions(-)
create mode 100644 changelogs/unreleased/216491-monaco-diff-selection.yml
create mode 100644 changelogs/unreleased/225932-replace-fa-arrow-icons-with-gitlab-svg-arrow-icons.yml
create mode 100644 changelogs/unreleased/233685-replace-bootstrap-alerts-in-app-views-shared-issuable-_form-html-h.yml
create mode 100644 changelogs/unreleased/233689-replace-bootstrap-alerts-in-app-views-profiles-two_factor_auths-sh.yml
create mode 100644 changelogs/unreleased/246502-fix-always-visible-sidebar-spinner.yml
create mode 100644 changelogs/unreleased/rails-save-bang-19.yml
create mode 100644 changelogs/unreleased/rails-save-bang-24.yml
create mode 100644 changelogs/unreleased/sh-update-faraday-and-other-gems.yml
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 @@