Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-12-12

# Conflicts: # app/assets/javascripts/sidebar/sidebar_mediator.js # app/assets/stylesheets/pages/groups.scss # app/controllers/projects/merge_requests_controller.rb # app/models/epic.rb # app/models/user.rb # app/policies/group_policy.rb # app/services/ci/create_pipeline_service.rb # app/services/protected_branches/access_level_params.rb # app/services/protected_branches/api_service.rb # app/views/layouts/_search.html.haml # app/views/layouts/nav/sidebar/_group.html.haml # app/views/projects/commits/_commit.html.haml # app/views/projects/issues/show.html.haml # app/views/shared/_outdated_browser.html.haml # config/routes/group.rb # doc/administration/index.md # doc/administration/operations/index.md # doc/development/automatic_ce_ee_merge.md # doc/development/limit_ee_conflicts.md # lib/api/entities.rb # lib/api/projects.rb # lib/banzai/filter/epic_reference_filter.rb # lib/banzai/filter/upload_link_filter.rb # lib/banzai/reference_parser/epic_parser.rb # lib/gitlab/ci/pipeline/chain/command.rb # lib/gitlab/git_access.rb # lib/gitlab/utils.rb # spec/helpers/boards_helper_spec.rb # spec/helpers/merge_requests_helper_spec.rb # spec/javascripts/boards/boards_store_spec.js # spec/lib/banzai/filter/upload_link_filter_spec.rb # spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb # spec/models/namespace_spec.rb [ci skip]

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-12-12
# Conflicts: # app/assets/javascripts/sidebar/sidebar_mediator.js # app/assets/stylesheets/pages/groups.scss # app/controllers/projects/merge_requests_controller.rb # app/models/epic.rb # app/models/user.rb # app/policies/group_policy.rb # app/services/ci/create_pipeline_service.rb # app/services/protected_branches/access_level_params.rb # app/services/protected_branches/api_service.rb # app/views/layouts/_search.html.haml # app/views/layouts/nav/sidebar/_group.html.haml # app/views/projects/commits/_commit.html.haml # app/views/projects/issues/show.html.haml # app/views/shared/_outdated_browser.html.haml # config/routes/group.rb # doc/administration/index.md # doc/administration/operations/index.md # doc/development/automatic_ce_ee_merge.md # doc/development/limit_ee_conflicts.md # lib/api/entities.rb # lib/api/projects.rb # lib/banzai/filter/epic_reference_filter.rb # lib/banzai/filter/upload_link_filter.rb # lib/banzai/reference_parser/epic_parser.rb # lib/gitlab/ci/pipeline/chain/command.rb # lib/gitlab/git_access.rb # lib/gitlab/utils.rb # spec/helpers/boards_helper_spec.rb # spec/helpers/merge_requests_helper_spec.rb # spec/javascripts/boards/boards_store_spec.js # spec/lib/banzai/filter/upload_link_filter_spec.rb # spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb # spec/models/namespace_spec.rb [ci skip]
d71bbcaf · GitLab Bot · b5862567 · 8d739237 · d71bbcaf · d71bbcaf
Commit d71bbcaf authored Dec 12, 2017 by GitLab Bot
298 changed files
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -599,6 +599,7 @@ merge request:
    present time and never use past tense (has been/was). For example instead
    of _prohibited this user from being saved due to the following errors:_ the
    text should be _sorry, we could not create your account because:_
+1.  Code should be written in [US English][us-english]

 This is also the style used by linting tools such as
 [RuboCop](https://github.com/bbatsov/rubocop),
@@ -682,6 +683,7 @@ When your code contains more than 500 changes, any major breaking changes, or an
 [GitLab Inc engineering workflow]: https://about.gitlab.com/handbook/engineering/workflow/#labelling-issues
 [polling-etag]: https://docs.gitlab.com/ce/development/polling.html
 [testing]: doc/development/testing_guide/index.md
+[us-english]: https://en.wikipedia.org/wiki/American_English

 [^1]: Please note that specs other than JavaScript specs are considered backend
      code.
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-0.57.0
+0.59.0
--- a/Gemfile
+++ b/Gemfile
@@ -295,7 +295,7 @@ group :metrics do
  gem 'influxdb', '~> 0.2', require: false

  # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.7.0.beta39'
+  gem 'prometheus-client-mmap', '~> 0.7.0.beta43'
  gem 'raindrops', '~> 0.18'
 end

@@ -427,3 +427,6 @@ gem 'flipper-active_record', '~> 0.10.2'
 # Structured logging
 gem 'lograge', '~> 0.5'
 gem 'grape_logging', '~> 1.7'
+
+# Asset synchronization
+gem 'asset_sync', '~> 2.2.0'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,6 +58,11 @@ GEM
    asciidoctor (1.5.3)
    asciidoctor-plantuml (0.0.7)
      asciidoctor (~> 1.5)
+    asset_sync (2.2.0)
+      activemodel (>= 4.1.0)
+      fog-core
+      mime-types (>= 2.99)
+      unf
    ast (2.3.0)
    atomic (1.1.99)
    attr_encrypted (3.0.3)
@@ -514,7 +519,6 @@ GEM
    mini_mime (0.1.4)
    mini_portile2 (2.3.0)
    minitest (5.7.0)
-    mmap2 (2.2.9)
    mousetrap-rails (1.4.6)
    multi_json (1.12.2)
    multi_xml (0.6.0)
@@ -652,8 +656,7 @@ GEM
      parser
      unparser
    procto (0.0.3)
-    prometheus-client-mmap (0.7.0.beta39)
-      mmap2 (~> 2.2, >= 2.2.9)
+    prometheus-client-mmap (0.7.0.beta43)
    pry (0.10.4)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
@@ -1007,6 +1010,7 @@ DEPENDENCIES
  asana (~> 0.6.0)
  asciidoctor (~> 1.5.2)
  asciidoctor-plantuml (= 0.0.7)
+  asset_sync (~> 2.2.0)
  attr_encrypted (~> 3.0.0)
  awesome_print (~> 1.2.0)
  aws-sdk
@@ -1147,7 +1151,7 @@ DEPENDENCIES
  peek-sidekiq (~> 1.0.3)
  pg (~> 0.18.2)
  premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.7.0.beta39)
+  prometheus-client-mmap (~> 0.7.0.beta43)
  pry-byebug (~> 3.4.1)
  pry-rails (~> 0.3.4)
  rack-attack (~> 4.4.1)

--- a/app/assets/images/icons.json
+++ b/app/assets/images/icons.json
-{"iconCount":179,"spriteSize":81882,"icons":["abuse","account","admin","angle-double-left","angle-double-right","angle-down","angle-left","angle-right","angle-up","appearance","applications","approval","arrow-right","assignee","bold","book","branch","bullhorn","calendar","cancel","chart","chevron-down","chevron-left","chevron-right","chevron-up","clock","close","code","collapse","comment-dots","comment-next","comment","comments","commit","credit-card","cut","dashboard","disk","doc_code","doc_image","doc_text","double-headed-arrow","download","duplicate","earth","ellipsis_v","emoji_slightly_smiling_face","emoji_smile","emoji_smiley","epic","external-link","eye-slash","eye","file-addition","file-deletion","file-modified","filter","folder","fork","geo-nodes","git-merge","group","history","home","hook","hourglass","image-comment-dark","import","issue-block","issue-child","issue-close","issue-duplicate","issue-new","issue-open-m","issue-open","issue-parent","issues","italic","key-2","key","label","labels","leave","level-up","license","link","list-bulleted","list-numbered","location-dot","location","lock-open","lock","log","mail","menu","merge-request-close","messages","mobile-issue-close","monitor","more","notifications-off","notifications","overview","pencil-square","pencil","pipeline","play","plus-square-o","plus-square","plus","preferences","profile","project","push-rules","question-o","question","quote","redo","remove","repeat","retry","scale","screen-full","screen-normal","scroll_down","scroll_up","search","settings","shield","slight-frown","slight-smile","smile","smiley","snippet","spam","spinner","star-o","star","status_canceled_borderless","status_canceled","status_closed","status_created_borderless","status_created","status_failed_borderless","status_failed","status_manual_borderless","status_manual","status_notfound_borderless","status_open","status_pending_borderless","status_pending","status_running_borderless","status_running","status_skipped_borderless","status_skipped","status_success_borderless","status_success_solid","status_success","status_warning_borderless","status_warning","stop","task-done","template","terminal","thumb-down","thumb-up","thumbtack","timer","todo-add","todo-done","token","unapproval","unassignee","unlink","user","users","volume-up","warning","work"]}
\ No newline at end of file
+{"iconCount":180,"spriteSize":82176,"icons":["abuse","account","admin","angle-double-left","angle-double-right","angle-down","angle-left","angle-right","angle-up","appearance","applications","approval","arrow-down","arrow-right","assignee","bold","book","branch","bullhorn","calendar","cancel","chart","chevron-down","chevron-left","chevron-right","chevron-up","clock","close","code","collapse","comment-dots","comment-next","comment","comments","commit","credit-card","cut","dashboard","disk","doc_code","doc_image","doc_text","double-headed-arrow","download","duplicate","earth","ellipsis_v","emoji_slightly_smiling_face","emoji_smile","emoji_smiley","epic","external-link","eye-slash","eye","file-addition","file-deletion","file-modified","filter","folder","fork","geo-nodes","git-merge","group","history","home","hook","hourglass","image-comment-dark","import","issue-block","issue-child","issue-close","issue-duplicate","issue-new","issue-open-m","issue-open","issue-parent","issues","italic","key-2","key","label","labels","leave","level-up","license","link","list-bulleted","list-numbered","location-dot","location","lock-open","lock","log","mail","menu","merge-request-close","messages","mobile-issue-close","monitor","more","notifications-off","notifications","overview","pencil-square","pencil","pipeline","play","plus-square-o","plus-square","plus","preferences","profile","project","push-rules","question-o","question","quote","redo","remove","repeat","retry","scale","screen-full","screen-normal","scroll_down","scroll_up","search","settings","shield","slight-frown","slight-smile","smile","smiley","snippet","spam","spinner","star-o","star","status_canceled_borderless","status_canceled","status_closed","status_created_borderless","status_created","status_failed_borderless","status_failed","status_manual_borderless","status_manual","status_notfound_borderless","status_open","status_pending_borderless","status_pending","status_running_borderless","status_running","status_skipped_borderless","status_skipped","status_success_borderless","status_success_solid","status_success","status_warning_borderless","status_warning","stop","task-done","template","terminal","thumb-down","thumb-up","thumbtack","timer","todo-add","todo-done","token","unapproval","unassignee","unlink","user","users","volume-up","warning","work"]}
\ No newline at end of file
--- a/app/assets/images/icons.svg
+++ b/app/assets/images/icons.svg
--- a/app/assets/images/illustrations/clusters_empty.svg
+++ b/app/assets/images/illustrations/clusters_empty.svg
-<svg height="128" viewBox="0 0 142 128" width="142" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M94 62h20v4H94z" fill="#f0edf8"/><path d="M84.828 84l17.678 17.678-2.828 2.828L82 86.828z" fill="#fee1d3"/><path d="M42.828 24l17.678 17.678-2.828 2.828L40 26.828zM40 101.678L57.678 84l2.828 2.828-17.678 17.678z" fill="#f0edf8"/><g fill="#fee1d3"><path d="M82 41.678L99.678 24l2.828 2.828-17.678 17.678zM28 62h20v4H28z"/><rect height="30" rx="5" width="30" y="49"/></g><rect height="26" rx="5" stroke="#fdc4a8" stroke-width="4" width="26" x="2" y="51"/><rect fill="#c3b8e3" height="50" rx="10" width="50" x="46" y="39"/><rect height="46" rx="10" stroke="#6b4fbb" stroke-width="4" width="46" x="48" y="41"/><rect fill="#fef0e8" height="30" rx="5" width="30" x="84"/><rect height="26" rx="5" stroke="#fee1d3" stroke-width="4" width="26" x="86" y="2"/><rect fill="#fee1d3" height="30" rx="5" width="30" x="84" y="98"/><rect height="26" rx="5" stroke="#fdc4a8" stroke-width="4" width="26" x="86" y="100"/><rect fill="#f0edf8" height="30" rx="5" width="30" x="112" y="49"/><rect height="26" rx="5" stroke="#e1dbf1" stroke-width="4" width="26" x="114" y="51"/><rect fill="#f0edf8" height="30" rx="5" width="30" x="28" y="98"/><rect height="26" rx="5" stroke="#e1dbf1" stroke-width="4" width="26" x="30" y="100"/><rect fill="#f0edf8" height="30" rx="5" width="30" x="28"/><rect height="26" rx="5" stroke="#e1dbf1" stroke-width="4" width="26" x="30" y="2"/></g></svg>
\ No newline at end of file
+<svg height="128" viewBox="0 0 142 128" width="142" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path d="M94 62h20v4H94z" fill="#f0edf8"/><path d="M84.828 84l17.678 17.678-2.828 2.828L82 86.828z" fill="#fee1d3"/><path d="M42.828 24l17.678 17.678-2.828 2.828L40 26.828zM40 101.678L57.678 84l2.828 2.828-17.678 17.678z" fill="#f0edf8"/><path d="M82 41.678L99.678 24l2.828 2.828-17.678 17.678zM28 62h20v4H28zM3 52h24v24H3z" fill="#fee1d3"/><path d="M31 3h24v24H31z" fill="#f0edf8"/><path d="M87 3h24v24H87z" fill="#fef0e8"/><path d="M115 52h24v24h-24z" fill="#f0edf8"/><path d="M87 101h24v24H87z" fill="#fee1d3"/><path d="M31 101h24v24H31z" fill="#f0edf8"/><path d="M49 42h44v44H49z" fill="#c3b8e3"/><g fill-rule="nonzero"><path d="M5 53a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V54a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H5a5 5 0 0 1-5-5V54a5 5 0 0 1 5-5z" fill="#fdc4a8"/><path d="M56 43a6 6 0 0 0-6 6v30a6 6 0 0 0 6 6h30a6 6 0 0 0 6-6V49a6 6 0 0 0-6-6zm0-4h30c5.523 0 10 4.477 10 10v30c0 5.523-4.477 10-10 10H56c-5.523 0-10-4.477-10-10V49c0-5.523 4.477-10 10-10z" fill="#6b4fbb"/><path d="M89 4a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H89a5 5 0 0 1-5-5V5a5 5 0 0 1 5-5z" fill="#fee1d3"/><path d="M89 102a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1v-20a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H89a5 5 0 0 1-5-5v-20a5 5 0 0 1 5-5z" fill="#fdc4a8"/><path d="M117 53a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V54a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5h-20a5 5 0 0 1-5-5V54a5 5 0 0 1 5-5zM33 102a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1v-20a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H33a5 5 0 0 1-5-5v-20a5 5 0 0 1 5-5zM33 4a1 1 0 0 0-1 1v20a1 1 0 0 0 1 1h20a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm0-4h20a5 5 0 0 1 5 5v20a5 5 0 0 1-5 5H33a5 5 0 0 1-5-5V5a5 5 0 0 1 5-5z" fill="#e1dbf1"/></g></g></svg>
\ No newline at end of file
--- a/app/assets/images/illustrations/merge_request_changes_empty.svg
+++ b/app/assets/images/illustrations/merge_request_changes_empty.svg
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 374 268" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><rect id="d" width="230" height="176" rx="10" fill="#fff"/><rect id="e" width="14" rx="2" height="4"/><rect id="f" width="14" x="40" rx="2" height="4"/><rect id="g" width="14" x="40" y="24" rx="2" height="4"/><rect id="h" width="7" x="20" y="12" rx="2" height="4"/><rect id="i" width="7" y="24" rx="2" height="4"/><rect id="j" width="7" x="33" y="12" rx="2" height="4"/><circle id="l" cx="31" cy="31" r="31"/><circle id="c" cx="35" cy="35" r="35"/><circle id="a" cx="44" cy="44" r="44"/><circle id="b" cx="31" cy="31" r="31"/></defs><g fill="none" fill-rule="evenodd"><g transform="translate(0 94)"><circle cx="57" cy="57" r="44" fill="#f9f9f9"/><g transform="rotate(-7.999 120.507 -22.508)"><use fill="#fff" xlink:href="#a"/><circle cx="44" cy="44" r="42" stroke="#eee" stroke-width="4"/><path fill="#fee1d3" fill-rule="nonzero" d="M34.394 55.736A4 4 0 0 1 36.706 55H56a6 6 0 0 0 6-6V35a6 6 0 0 0-6-6H34a6 6 0 0 0-6 6v25.26l6.394-4.529m2.312 3.264l-7.972 5.647A3.001 3.001 0 0 1 24 62.194v-27.2c0-5.523 4.477-10 10-10h22c5.523 0 10 4.477 10 10v14c0 5.523-4.477 10-10 10H36.706"/><path fill="#fc6d26" d="M38 40a2 2 0 1 1 .001 3.999A2 2 0 0 1 38 40m7 0a2 2 0 1 1 .001 3.999A2 2 0 0 1 45 40m7 0a2 2 0 1 1 .001 3.999A2 2 0 0 1 52 40"/></g></g><g transform="translate(48)"><circle cx="41" cy="41" r="31" fill="#f9f9f9"/><g transform="rotate(-7.999 84.554 -15.551)"><use fill="#fff" xlink:href="#b"/><circle cx="31" cy="31" r="29" stroke="#eee" stroke-width="4"/><rect width="20" height="4" x="21" y="29" fill="#6b4fbb" rx="2"/></g></g><path fill="#f9f9f9" d="M235.58 229H102c-6.627 0-12-5.373-12-12V65c0-6.627 5.373-12 12-12h206c6.627 0 12 5.373 12 12v18.399A34.834 34.834 0 0 1 337 79c19.33 0 35 15.67 35 35s-15.67 35-35 35a34.831 34.831 0 0 1-17-4.399v72.4c0 6.627-5.373 12-12 12h-11.58c.381 1.941.58 3.947.58 6 0 17.12-13.879 31-31 31-17.12 0-31-13.879-31-31 0-2.053.2-4.059.58-6"/><g transform="translate(87 50)"><g transform="rotate(7.999 -44.933 1563.894)"><use fill="#fff" xlink:href="#c"/><circle cx="35" cy="35" r="33" stroke="#eee" stroke-width="4"/><g transform="translate(20 19)"><circle cx="15" cy="16" r="15" fill="#f4f1fa" stroke="#6b4fbb" stroke-width="3"/><g fill="#6b4fbb"><path d="M19.419 6.996h-.007L16.959 4l-2.454 2.997H14.5L12.046 4 9.591 6.998h-.003L7.133 4 4.677 6.999H2.001c2.605-4.204 7.231-7 12.502-7 5.269 0 9.892 2.793 12.498 6.994h-2.676l-2.452-2.994-2.453 2.996"/><circle cx="9.5" cy="17.5" r="1.5"/><circle cx="20.5" cy="17.5" r="1.5"/></g></g></g><use xlink:href="#d"/><rect width="226" height="172" x="2" y="2" stroke="#eee" stroke-width="4" rx="10"/><rect width="4" height="122" x="33" y="42" fill="#eee" rx="2"/><g transform="translate(13 59)"><rect width="10" height="4" fill="#fee1d3" rx="2"/><rect width="10" height="4" y="12" fill="#f0edf8" rx="2"/><rect width="10" height="4" y="24" fill="#fef0e9" rx="2"/><rect width="10" height="4" y="36" fill="#fee1d3" rx="2"/><rect width="10" height="4" y="48" fill="#e1dbf1" rx="2"/><rect width="10" height="4" y="60" fill="#f0edf8" rx="2"/><rect width="10" height="4" y="72" fill="#fef0e9" rx="2"/><rect width="10" height="4" y="84" fill="#fee1d3" rx="2"/></g><g transform="translate(55 59)"><use fill="#6b4fbb" xlink:href="#e"/><rect width="14" height="4" x="20" fill="#f0edf8" rx="2"/><use fill="#fef0e9" xlink:href="#f"/><rect width="14" height="4" y="12" fill="#f0edf8" rx="2"/><use fill="#fef0e9" xlink:href="#g"/><rect width="14" height="4" y="48" fill="#e1dbf1" rx="2"/><rect width="14" height="4" x="40" y="36" fill="#fef0e9" rx="2"/><use fill="#fee1d3" xlink:href="#h"/><rect width="7" height="4" x="27" y="36" fill="#6b4fbb" rx="2"/><rect width="7" height="4" x="20" y="48" fill="#fee1d3" rx="2"/><use fill="#fc6d26" xlink:href="#i"/><rect width="21" height="4" x="13" y="24" fill="#e1dbf1" rx="2"/><rect width="21" height="4" y="36" fill="#eee" rx="2"/><use fill="#6b4fbb" xlink:href="#j"/><g transform="translate(98)"><use fill="#fee1d3" xlink:href="#e"/><rect width="14" height="4" x="20" fill="#f0edf8" rx="2"/><use fill="#fc6d26" xlink:href="#f"/><rect width="14" height="4" y="12" fill="#fef0e9" rx="2" id="k"/><use fill="#e1dbf1" xlink:href="#g"/><rect width="14" height="4" y="48" fill="#f0edf8" rx="2"/><rect width="14" height="4" x="40" y="36" fill="#fee1d3" rx="2"/><use fill="#fc6d26" xlink:href="#h"/><rect width="7" height="4" x="27" y="36" fill="#6b4fbb" rx="2"/><rect width="7" height="4" x="20" y="48" fill="#fc6d26" rx="2"/><use fill="#6b4fbb" xlink:href="#i"/><rect width="21" height="4" x="13" y="24" fill="#fee1d3" rx="2"/><rect width="21" height="4" y="36" fill="#fef0e9" rx="2"/><use fill="#6b4fbb" xlink:href="#j"/></g><g transform="translate(0 60)"><use fill="#f0edf8" xlink:href="#e"/><rect width="14" height="4" x="20" fill="#6b4fbb" rx="2"/><use fill="#e1dbf1" xlink:href="#f"/><use xlink:href="#k"/><use fill="#fee1d3" xlink:href="#g"/><use fill="#eee" xlink:href="#h"/><use fill="#6b4fbb" xlink:href="#i"/><rect width="21" height="4" x="13" y="24" fill="#fef0e9" rx="2"/><use fill="#fc6d26" xlink:href="#j"/></g><rect width="4" height="63" x="74" y="13" fill="#eee" rx="2"/></g><rect width="230" height="4" y="27" fill="#eee" rx="2"/></g><g transform="rotate(7.999 -1289.786 1797.583)"><use fill="#fff" xlink:href="#l"/><circle cx="31" cy="31" r="29" stroke="#eee" stroke-width="4"/><path fill="#fc6d26" d="M29 29h-6a2 2 0 1 0 0 4h6v6a2 2 0 1 0 4 0v-6h6a2 2 0 1 0 0-4h-6v-6a2 2 0 1 0-4 0v6"/></g></g></svg>
\ No newline at end of file
--- a/app/assets/javascripts/commit/image_file.js
+++ b/app/assets/javascripts/commit/image_file.js
@@ -121,7 +121,7 @@ export default class ImageFile {
      return $('.swipe.view', this.file).each((function(_this) {
        return function(index, view) {
          var $swipeWrap, $swipeBar, $swipeFrame, wrapPadding, ref;
-          ref = this.prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1];
+          ref = _this.prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1];
          $swipeFrame = $('.swipe-frame', view);
          $swipeWrap = $('.swipe-wrap', view);
          $swipeBar = $('.swipe-bar', view);
@@ -158,7 +158,7 @@ export default class ImageFile {
      return $('.onion-skin.view', this.file).each((function(_this) {
        return function(index, view) {
          var $frame, $track, $dragger, $frameAdded, framePadding, ref, dragging = false;
-          ref = this.prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1];
+          ref = _this.prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1];
          $frame = $('.onion-skin-frame', view);
          $frameAdded = $('.frame.added', view);
          $track = $('.drag-track', view);

--- a/app/assets/javascripts/deploy_keys/components/action_btn.vue
+++ b/app/assets/javascripts/deploy_keys/components/action_btn.vue
@@ -32,7 +32,9 @@
      doAction() {
        this.isLoading = true;

-        eventHub.$emit(`${this.type}.key`, this.deployKey);
+        eventHub.$emit(`${this.type}.key`, this.deployKey, () => {
+          this.isLoading = false;
+        });
      },
    },
    computed: {
@@ -50,6 +52,9 @@
    :disabled="isLoading"
    @click="doAction">
    {{ text }}
-    <loading-icon v-if="isLoading" />
+    <loading-icon
+      v-if="isLoading"
+      :inline="true"
+    />
  </button>
 </template>
--- a/app/assets/javascripts/deploy_keys/components/app.vue
+++ b/app/assets/javascripts/deploy_keys/components/app.vue
@@ -47,12 +47,15 @@
          .then(() => this.fetchKeys())
          .catch(() => new Flash('Error enabling deploy key'));
      },
-      disableKey(deployKey) {
+      disableKey(deployKey, callback) {
        // eslint-disable-next-line no-alert
        if (confirm('You are going to remove this deploy key. Are you sure?')) {
          this.service.disableKey(deployKey.id)
            .then(() => this.fetchKeys())
+            .then(callback)
            .catch(() => new Flash('Error removing deploy key'));
+        } else {
+          callback();
        }
      },
    },

--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -588,13 +588,6 @@ import initGroupAnalytics from './init_group_analytics';
        case 'projects:settings:ci_cd:show':
          // Initialize expandable settings panels
          initSettingsPanels();
-
-          import(/* webpackChunkName: "ci-cd-settings" */ './projects/ci_cd_settings_bundle')
-            .then(ciCdSettings => ciCdSettings.default())
-            .catch((err) => {
-              Flash(s__('ProjectSettings|Problem setting up the CI/CD settings JavaScript'));
-              throw err;
-            });
        case 'groups:settings:ci_cd:show':
          new ProjectVariables();
          break;

--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -287,6 +287,10 @@ class GfmAutoComplete {
  }

  setupLabels($input) {
+    const fetchData = this.fetchData.bind(this);
+    const LABEL_COMMAND = { LABEL: '/label', UNLABEL: '/unlabel', RELABEL: '/relabel' };
+    let command = '';
+
    $input.atwho({
      at: '~',
      alias: 'labels',
@@ -309,8 +313,45 @@ class GfmAutoComplete {
            title: sanitize(m.title),
            color: m.color,
            search: m.title,
+            set: m.set,
          }));
        },
+        matcher(flag, subtext) {
+          const match = GfmAutoComplete.defaultMatcher(flag, subtext, this.app.controllers);
+          const subtextNodes = subtext.split(/\n+/g).pop().split(GfmAutoComplete.regexSubtext);
+
+          // Check if ~ is followed by '/label', '/relabel' or '/unlabel' commands.
+          command = subtextNodes.find((node) => {
+            if (node === LABEL_COMMAND.LABEL ||
+                node === LABEL_COMMAND.RELABEL ||
+                node === LABEL_COMMAND.UNLABEL) { return node; }
+            return null;
+          });
+
+          return match && match.length ? match[1] : null;
+        },
+        filter(query, data, searchKey) {
+          if (GfmAutoComplete.isLoading(data)) {
+            fetchData(this.$inputor, this.at);
+            return data;
+          }
+
+          if (data === GfmAutoComplete.defaultLoadingData) {
+            return $.fn.atwho.default.callbacks.filter(query, data, searchKey);
+          }
+
+          // The `LABEL_COMMAND.RELABEL` is intentionally skipped
+          // because we want to return all the labels (unfiltered) for that command.
+          if (command === LABEL_COMMAND.LABEL) {
+            // Return labels with set: undefined.
+            return data.filter(label => !label.set);
+          } else if (command === LABEL_COMMAND.UNLABEL) {
+            // Return labels with set: true.
+            return data.filter(label => label.set);
+          }
+
+          return data;
+        },
      },
    });
  }
@@ -346,20 +387,7 @@ class GfmAutoComplete {
        return resultantValue;
      },
      matcher(flag, subtext) {
-        // The below is taken from At.js source
-        // Tweaked to commands to start without a space only if char before is a non-word character
-        // https://github.com/ichord/At.js
-        const atSymbolsWithBar = Object.keys(this.app.controllers).join('|');
-        const atSymbolsWithoutBar = Object.keys(this.app.controllers).join('');
-        const targetSubtext = subtext.split(/\s+/g).pop();
-        const resultantFlag = flag.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
-
-        const accentAChar = decodeURI('%C3%80');
-        const accentYChar = decodeURI('%C3%BF');
-
-        const regexp = new RegExp(`^(?:\\B|[^a-zA-Z0-9_${atSymbolsWithoutBar}]|\\s)${resultantFlag}(?!${atSymbolsWithBar})((?:[A-Za-z${accentAChar}-${accentYChar}0-9_'.+-]|[^\\x00-\\x7a])*)$`, 'gi');
-
-        const match = regexp.exec(targetSubtext);
+        const match = GfmAutoComplete.defaultMatcher(flag, subtext, this.app.controllers);

        if (match) {
          return match[1];
@@ -420,8 +448,27 @@ class GfmAutoComplete {
    return dataToInspect &&
      (dataToInspect === loadingState || dataToInspect.name === loadingState);
  }
+
+  static defaultMatcher(flag, subtext, controllers) {
+    // The below is taken from At.js source
+    // Tweaked to commands to start without a space only if char before is a non-word character
+    // https://github.com/ichord/At.js
+    const atSymbolsWithBar = Object.keys(controllers).join('|');
+    const atSymbolsWithoutBar = Object.keys(controllers).join('');
+    const targetSubtext = subtext.split(GfmAutoComplete.regexSubtext).pop();
+    const resultantFlag = flag.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
+
+    const accentAChar = decodeURI('%C3%80');
+    const accentYChar = decodeURI('%C3%BF');
+
+    const regexp = new RegExp(`^(?:\\B|[^a-zA-Z0-9_${atSymbolsWithoutBar}]|\\s)${resultantFlag}(?!${atSymbolsWithBar})((?:[A-Za-z${accentAChar}-${accentYChar}0-9_'.+-]|[^\\x00-\\x7a])*)$`, 'gi');
+
+    return regexp.exec(targetSubtext);
+  }
 }

+GfmAutoComplete.regexSubtext = new RegExp(/\s+/g);
+
 GfmAutoComplete.defaultLoadingData = ['loading'];

 GfmAutoComplete.atTypeMap = {

--- a/app/assets/javascripts/issue_show/index.js
+++ b/app/assets/javascripts/issue_show/index.js
@@ -5,7 +5,7 @@ import '../vue_shared/vue_resource_interceptor';

 document.addEventListener('DOMContentLoaded', () => {
  const initialDataEl = document.getElementById('js-issuable-app-initial-data');
-  const initialData = JSON.parse(initialDataEl.innerHTML.replace(/&quot;/g, '"'));
+  const props = JSON.parse(initialDataEl.innerHTML.replace(/&quot;/g, '"'));

  $('.issuable-edit').on('click', (e) => {
    e.preventDefault();
@@ -18,32 +18,9 @@ document.addEventListener('DOMContentLoaded', () => {
    components: {
      issuableApp,
    },
-    data() {
-      return {
-        ...initialData,
-      };
-    },
    render(createElement) {
      return createElement('issuable-app', {
-        props: {
-          canUpdate: this.canUpdate,
-          canDestroy: this.canDestroy,
-          endpoint: this.endpoint,
-          issuableRef: this.issuableRef,
-          initialTitleHtml: this.initialTitleHtml,
-          initialTitleText: this.initialTitleText,
-          initialDescriptionHtml: this.initialDescriptionHtml,
-          initialDescriptionText: this.initialDescriptionText,
-          issuableTemplates: this.issuableTemplates,
-          markdownPreviewPath: this.markdownPreviewPath,
-          markdownDocsPath: this.markdownDocsPath,
-          projectPath: this.projectPath,
-          projectNamespace: this.projectNamespace,
-          updatedAt: this.updatedAt,
-          updatedByName: this.updatedByName,
-          updatedByPath: this.updatedByPath,
-          initialTaskStatus: this.initialTaskStatus,
-        },
+        props,
      });
    },
  });

--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -35,8 +35,6 @@ window.dateFormat = dateFormat;

    w.gl.utils.localTimeAgo = function($timeagoEls, setTimeago = true) {
      $timeagoEls.each((i, el) => {
-        el.setAttribute('title', el.getAttribute('title'));
-
        if (setTimeago) {
          // Recreate with custom template
          $(el).tooltip({

--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -21,6 +21,8 @@
        hasMetrics: convertPermissionToBoolean(metricsData.hasMetrics),
        documentationPath: metricsData.documentationPath,
        settingsPath: metricsData.settingsPath,
+        tagsPath: metricsData.tagsPath,
+        projectPath: metricsData.projectPath,
        metricsEndpoint: metricsData.additionalMetrics,
        deploymentEndpoint: metricsData.deploymentEndpoint,
        emptyGettingStartedSvgPath: metricsData.emptyGettingStartedSvgPath,
@@ -112,6 +114,8 @@
        :hover-data="hoverData"
        :update-aspect-ratio="updateAspectRatio"
        :deployment-data="store.deploymentData"
+        :project-path="projectPath"
+        :tags-path="tagsPath"
      />
    </graph-group>
  </div>

--- a/app/assets/javascripts/monitoring/components/graph.vue
+++ b/app/assets/javascripts/monitoring/components/graph.vue
@@ -30,6 +30,14 @@
        required: false,
        default: () => ({}),
      },
+      projectPath: {
+        type: String,
+        required: true,
+      },
+      tagsPath: {
+        type: String,
+        required: true,
+      },
    },

    mixins: [MonitoringMixin],
@@ -251,6 +259,14 @@
              :line-color="path.lineColor"
              :area-color="path.areaColor"
            />
+            <rect
+              class="prometheus-graph-overlay"
+              :width="(graphWidth - 70)"
+              :height="(graphHeight - 100)"
+              transform="translate(-5, 20)"
+              ref="graphOverlay"
+              @mousemove="handleMouseOverGraph($event)">
+            </rect>
            <graph-deployment
              :show-deploy-info="showDeployInfo"
              :deployment-data="reducedDeploymentData"
@@ -267,14 +283,6 @@
              :graph-height-offset="graphHeightOffset"
              :show-flag-content="showFlagContent"
            />
-            <rect
-              class="prometheus-graph-overlay"
-              :width="(graphWidth - 70)"
-              :height="(graphHeight - 100)"
-              transform="translate(-5, 20)"
-              ref="graphOverlay"
-              @mousemove="handleMouseOverGraph($event)">
-            </rect>
        </svg>
      </svg>
    </div>

--- a/app/assets/javascripts/monitoring/components/graph/deployment.vue
+++ b/app/assets/javascripts/monitoring/components/graph/deployment.vue
 <script>
-  import { dateFormat, timeFormat } from '../../utils/date_time_formatters';
+  import { dateFormatWithName, timeFormat } from '../../utils/date_time_formatters';
+  import Icon from '../../../vue_shared/components/icon.vue';

  export default {
    props: {
@@ -25,6 +26,10 @@
      },
    },

+    components: {
+      Icon,
+    },
+
    computed: {
      calculatedHeight() {
        return this.graphHeight - this.graphHeightOffset;
@@ -33,7 +38,7 @@

    methods: {
      refText(d) {
-        return d.tag ? d.ref : d.sha.slice(0, 6);
+        return d.tag ? d.ref : d.sha.slice(0, 8);
      },

      formatTime(deploymentTime) {
@@ -41,7 +46,7 @@
      },

      formatDate(deploymentTime) {
-        return dateFormat(deploymentTime);
+        return dateFormatWithName(deploymentTime);
      },

      nameDeploymentClass(deployment) {
@@ -54,11 +59,19 @@

      positionFlag(deployment) {
        let xPosition = 3;
-        if (deployment.xPos > (this.graphWidth - 200)) {
-          xPosition = -97;
+        if (deployment.xPos > (this.graphWidth - 225)) {
+          xPosition = -142;
        }
        return xPosition;
      },
+
+      svgContainerHeight(tag) {
+        let svgHeight = 80;
+        if (!tag) {
+          svgHeight -= 20;
+        }
+        return svgHeight;
+      },
    },
  };
 </script>
@@ -91,35 +104,75 @@
        class="js-deploy-info-box"
        :x="positionFlag(deployment)"
        y="0"
-        width="92"
-        height="60">
+        width="134"
+        :height="svgContainerHeight(deployment.tag)">
        <rect
          class="rect-text-metric deploy-info-rect rect-metric"
          x="1"
          y="1"
          rx="2"
-          width="90"
-          height="58">
+          width="132"
+          :height="svgContainerHeight(deployment.tag) - 2">
        </rect>
-        <g
-          transform="translate(5, 2)">
-          <text
-            class="deploy-info-text text-metric-bold">
-            {{refText(deployment)}}
-          </text>
-        </g>
-        <text
-          class="deploy-info-text"
-          y="18"
-          transform="translate(5, 2)">
-          {{formatDate(deployment.time)}}
-        </text>
        <text
          class="deploy-info-text text-metric-bold"
-          y="38"
          transform="translate(5, 2)">
-          {{formatTime(deployment.time)}}
+          Deployed
        </text>
+        <!--The date info-->
+        <g transform="translate(5, 20)">
+          <text class="deploy-info-text">
+            {{formatDate(deployment.time)}}
+          </text>
+          <text 
+            class="deploy-info-text text-metric-bold"
+            x="62">
+            {{formatTime(deployment.time)}}
+          </text>
+        </g>
+        <line
+          class="divider-line"
+          x1="0"
+          y1="38"
+          x2="132"
+          :y2="38"
+          stroke="#000">
+        </line>
+        <!--Commit information-->
+        <g transform="translate(5, 40)">
+          <icon
+            name="commit"
+            :width="12"
+            :height="12"
+            :y="3">
+          </icon>
+          <a :xlink:href="deployment.commitUrl">
+            <text
+              class="deploy-info-text deploy-info-text-link"
+              transform="translate(20, 2)">
+              {{refText(deployment)}}
+            </text>
+          </a>
+        </g>
+        <!--Tag information-->
+        <g
+          transform="translate(5, 55)" 
+          v-if="deployment.tag">
+          <icon
+            name="label"
+            :width="12"
+            :height="12"
+            :y="5">
+          </icon>
+          <a :xlink:href="deployment.tagUrl">
+            <text
+              class="deploy-info-text deploy-info-text-link"
+              transform="translate(20, 2)"
+              y="2">
+              {{deployment.tag}}
+            </text>
+          </a>
+        </g>
      </svg>
    </g>
    <svg

--- a/app/assets/javascripts/monitoring/mixins/monitoring_mixins.js
+++ b/app/assets/javascripts/monitoring/mixins/monitoring_mixins.js
@@ -33,7 +33,9 @@ const mixins = {
            id: deployment.id,
            time,
            sha: deployment.sha,
+            commitUrl: `${this.projectPath}/commit/${deployment.sha}`,
            tag: deployment.tag,
+            tagUrl: `${this.tagsPath}/${deployment.tag}`,
            ref: deployment.ref.name,
            xPos,
            showDeploymentFlag: false,

--- a/app/assets/javascripts/monitoring/utils/date_time_formatters.js
+++ b/app/assets/javascripts/monitoring/utils/date_time_formatters.js
 import d3 from 'd3';

 export const dateFormat = d3.time.format('%b %-d, %Y');
+export const dateFormatWithName = d3.time.format('%a, %b %-d');
 export const timeFormat = d3.time.format('%-I:%M%p');
 export const bisectDate = d3.bisector(d => d.time).left;


--- a/app/assets/javascripts/notes/components/issue_comment_form.vue
+++ b/app/assets/javascripts/notes/components/issue_comment_form.vue
@@ -15,7 +15,7 @@
  import issuableStateMixin from '../mixins/issuable_state';

  export default {
-    name: 'issueCommentForm',
+    name: 'commentForm',
    data() {
      return {
        note: '',

--- a/app/assets/javascripts/notes/components/issue_note_body.vue
+++ b/app/assets/javascripts/notes/components/issue_note_body.vue
@@ -2,7 +2,7 @@
  import noteEditedText from './note_edited_text.vue';
  import noteAwardsList from './note_awards_list.vue';
  import noteAttachment from './note_attachment.vue';
-  import issueNoteForm from './issue_note_form.vue';
+  import noteForm from './note_form.vue';
  import TaskList from '../../task_list';
  import autosave from '../mixins/autosave';

@@ -29,7 +29,7 @@
      noteEditedText,
      noteAwardsList,
      noteAttachment,
-      issueNoteForm,
+      noteForm,
    },
    computed: {
      noteBody() {
@@ -87,7 +87,7 @@
    <div
      v-html="note.note_html"
      class="note-text md"></div>
-    <issue-note-form
+    <note-form
      v-if="isEditing"
      ref="noteForm"
      @handleFormUpdate="handleFormUpdate"

--- a/app/assets/javascripts/notes/components/issue_note_form.vue
+++ b/app/assets/javascripts/notes/components/issue_note_form.vue
--- a/app/assets/javascripts/notes/components/issue_discussion.vue
+++ b/app/assets/javascripts/notes/components/issue_discussion.vue
@@ -2,12 +2,12 @@
  import { mapActions, mapGetters } from 'vuex';
  import Flash from '../../flash';
  import { SYSTEM_NOTE } from '../constants';
-  import issueNote from './issue_note.vue';
  import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
+  import noteableNote from './noteable_note.vue';
  import noteHeader from './note_header.vue';
  import noteSignedOutWidget from './note_signed_out_widget.vue';
  import noteEditedText from './note_edited_text.vue';
-  import issueNoteForm from './issue_note_form.vue';
+  import noteForm from './note_form.vue';
  import placeholderNote from '../../vue_shared/components/notes/placeholder_note.vue';
  import placeholderSystemNote from '../../vue_shared/components/notes/placeholder_system_note.vue';
  import autosave from '../mixins/autosave';
@@ -25,12 +25,12 @@
      };
    },
    components: {
-      issueNote,
+      noteableNote,
      userAvatarLink,
      noteHeader,
      noteSignedOutWidget,
      noteEditedText,
-      issueNoteForm,
+      noteForm,
      placeholderNote,
      placeholderSystemNote,
    },
@@ -86,7 +86,7 @@
          return placeholderNote;
        }

-        return issueNote;
+        return noteableNote;
      },
      componentData(note) {
        return note.isPlaceholderNote ? note.notes[0] : note;
@@ -209,7 +209,7 @@
                    type="button"
                    class="js-vue-discussion-reply btn btn-text-field"
                    title="Add a reply">Reply...</button>
-                  <issue-note-form
+                  <note-form
                    v-if="isReplying"
                    save-button-title="Comment"
                    :discussion="note"

--- a/app/assets/javascripts/notes/components/issue_note.vue
+++ b/app/assets/javascripts/notes/components/issue_note.vue
@@ -5,7 +5,7 @@
  import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
  import noteHeader from './note_header.vue';
  import noteActions from './note_actions.vue';
-  import issueNoteBody from './issue_note_body.vue';
+  import noteBody from './note_body.vue';
  import eventHub from '../event_hub';

  export default {
@@ -26,7 +26,7 @@
      userAvatarLink,
      noteHeader,
      noteActions,
-      issueNoteBody,
+      noteBody,
    },
    computed: {
      ...mapGetters([
@@ -174,7 +174,7 @@
            @handleDelete="deleteHandler"
            />
        </div>
-        <issue-note-body
+        <note-body
          :note="note"
          :can-edit="note.current_user.can_edit"
          :is-editing="isEditing"

--- a/app/assets/javascripts/notes/components/issue_notes_app.vue
+++ b/app/assets/javascripts/notes/components/issue_notes_app.vue
@@ -4,16 +4,16 @@
  import Flash from '../../flash';
  import store from '../stores/';
  import * as constants from '../constants';
-  import issueNote from './issue_note.vue';
-  import issueDiscussion from './issue_discussion.vue';
+  import noteableNote from './noteable_note.vue';
+  import noteableDiscussion from './noteable_discussion.vue';
  import systemNote from '../../vue_shared/components/notes/system_note.vue';
-  import issueCommentForm from './issue_comment_form.vue';
+  import commentForm from './comment_form.vue';
  import placeholderNote from '../../vue_shared/components/notes/placeholder_note.vue';
  import placeholderSystemNote from '../../vue_shared/components/notes/placeholder_system_note.vue';
  import loadingIcon from '../../vue_shared/components/loading_icon.vue';

  export default {
-    name: 'issueNotesApp',
+    name: 'notesApp',
    props: {
      noteableData: {
        type: Object,
@@ -36,10 +36,10 @@
      };
    },
    components: {
-      issueNote,
-      issueDiscussion,
+      noteableNote,
+      noteableDiscussion,
      systemNote,
-      issueCommentForm,
+      commentForm,
      loadingIcon,
      placeholderNote,
      placeholderSystemNote,
@@ -69,10 +69,10 @@
          }
          return placeholderNote;
        } else if (note.individual_note) {
-          return note.notes[0].system ? systemNote : issueNote;
+          return note.notes[0].system ? systemNote : noteableNote;
        }

-        return issueDiscussion;
+        return noteableDiscussion;
      },
      getComponentData(note) {
        return note.individual_note ? note.notes[0] : note;
@@ -87,7 +87,7 @@
          .then(() => this.checkLocationHash())
          .catch(() => {
            this.isLoading = false;
-            Flash('Something went wrong while fetching issue comments. Please try again.');
+            Flash('Something went wrong while fetching comments. Please try again.');
          });
      },
      initPolling() {
@@ -147,6 +147,6 @@
        />
    </ul>

-    <issue-comment-form />
+    <comment-form />
  </div>
 </template>
--- a/app/assets/javascripts/notes/index.js
+++ b/app/assets/javascripts/notes/index.js
 import Vue from 'vue';
-import issueNotesApp from './components/issue_notes_app.vue';
+import notesApp from './components/notes_app.vue';

 document.addEventListener('DOMContentLoaded', () => new Vue({
  el: '#js-vue-notes',
  components: {
-    issueNotesApp,
+    notesApp,
  },
  data() {
    const notesDataset = document.getElementById('js-vue-notes').dataset;
@@ -32,7 +32,7 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
    };
  },
  render(createElement) {
-    return createElement('issue-notes-app', {
+    return createElement('notes-app', {
      props: {
        noteableData: this.noteableData,
        notesData: this.notesData,

--- a/app/assets/javascripts/projects/ci_cd_settings_bundle.js
+++ b/app/assets/javascripts/projects/ci_cd_settings_bundle.js
-function updateAutoDevopsRadios(radioWrappers) {
-  radioWrappers.forEach((radioWrapper) => {
-    const radio = radioWrapper.querySelector('.js-auto-devops-enable-radio');
-    const runPipelineCheckboxWrapper = radioWrapper.querySelector('.js-run-auto-devops-pipeline-checkbox-wrapper');
-    const runPipelineCheckbox = radioWrapper.querySelector('.js-run-auto-devops-pipeline-checkbox');
-
-    if (runPipelineCheckbox) {
-      runPipelineCheckbox.checked = radio.checked;
-      runPipelineCheckboxWrapper.classList.toggle('hide', !radio.checked);
-    }
-  });
-}
-
-export default function initCiCdSettings() {
-  const radioWrappers = document.querySelectorAll('.js-auto-devops-enable-radio-wrapper');
-  radioWrappers.forEach(radioWrapper =>
-    radioWrapper.addEventListener('change', () => updateAutoDevopsRadios(radioWrappers)),
-  );
-}
--- a/app/assets/javascripts/repo/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/repo/components/new_dropdown/index.vue
@@ -2,9 +2,11 @@
  import { mapState } from 'vuex';
  import newModal from './modal.vue';
  import upload from './upload.vue';
+  import icon from '../../../vue_shared/components/icon.vue';

  export default {
    components: {
+      icon,
      newModal,
      upload,
    },
@@ -41,11 +43,14 @@
          data-toggle="dropdown"
          aria-label="Create new file or directory"
        >
-          <i
-            class="fa fa-plus"
-            aria-hidden="true"
-          >
-          </i>
+          <icon
+            name="plus"
+            css-classes="pull-left"
+          />
+          <icon
+            name="arrow-down"
+            css-classes="pull-left"
+          />
        </button>
        <ul class="dropdown-menu">
          <li>

--- a/app/assets/javascripts/search_autocomplete.js
+++ b/app/assets/javascripts/search_autocomplete.js
--- a/app/assets/javascripts/sidebar/sidebar_mediator.js
+++ b/app/assets/javascripts/sidebar/sidebar_mediator.js
+<<<<<<< HEAD
 import Store from 'ee/sidebar/stores/sidebar_store';
+=======
+>>>>>>> upstream/master
 import { visitUrl } from '../lib/utils/url_utility';
 import Flash from '../flash';
 import Service from './services/sidebar_service';

--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+import Project from '~/project';
 import SmartInterval from '~/smart_interval';
 import Flash from '../flash';
 import {
@@ -140,6 +141,7 @@ export default {
            const el = document.createElement('div');
            el.innerHTML = res.body;
            document.body.appendChild(el);
+            Project.initRefSwitcher();
          }
        })
        .catch(() => new Flash('Something went wrong. Please try again.'));

--- a/app/assets/javascripts/vue_shared/components/icon.vue
+++ b/app/assets/javascripts/vue_shared/components/icon.vue
@@ -36,6 +36,30 @@
        required: false,
        default: '',
      },
+
+      width: {
+        type: Number,
+        required: false,
+        default: null,
+      },
+
+      height: {
+        type: Number,
+        required: false,
+        default: null,
+      },
+
+      y: {
+        type: Number,
+        required: false,
+        default: null,
+      },
+
+      x: {
+        type: Number,
+        required: false,
+        default: null,
+      },
    },

    computed: {
@@ -51,7 +75,11 @@

 <template>
  <svg
-    :class="[iconSizeClass, cssClasses]">
+    :class="[iconSizeClass, cssClasses]"
+    :width="width"
+    :height="height"
+    :x="x"
+    :y="y">
    <use
      v-bind="{'xlink:href':spriteHref}"/>
  </svg>

--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -241,19 +241,6 @@ li.note {
  }
 }

-.browser-alert {
-  padding: 10px;
-  text-align: center;
-  background: $error-bg;
-  color: $white-light;
-  font-weight: $gl-font-weight-bold;
-
-  a {
-    color: $white-light;
-    text-decoration: underline;
-  }
-}
-
 .warning_message {
  border-left: 4px solid $warning-message-border;
  color: $warning-message-color;

--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -432,6 +432,7 @@
      border-width: 1px;
      width: 17px;
      height: 17px;
+      top: 0;
    }

    &:hover,

--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -193,6 +193,7 @@

 .commit-content {
  padding-right: 10px;
+  white-space: normal;
 }

 .commit-actions {

--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -361,8 +361,9 @@
  stroke-width: 1;
 }

-.deploy-info-text {
-  dominant-baseline: text-before-edge;
+.divider-line {
+  stroke-width: 1;
+  stroke: $gray-darkest;
 }

 .prometheus-state {
@@ -472,6 +473,20 @@
      stroke: $gray-darker;
    }

+    .deploy-info-text {
+      dominant-baseline: text-before-edge;
+      font-size: 12px;
+    }
+
+    .deploy-info-text-link {
+      font-family: $monospace_font;
+      fill: $gl-link-color;
+
+      &:hover {
+        fill: $gl-link-hover-color;
+      }
+    }
+
    @media (max-width: $screen-sm-max) {
      .label-axis-text,
      .text-metric-usage,

--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -273,6 +273,7 @@ table.pipeline-project-metrics tr td {
  border-radius: $label-border-radius;
  font-weight: $gl-font-weight-normal;
 }
+<<<<<<< HEAD

 .plan-badge {
  margin-right: 15px;
@@ -308,3 +309,5 @@ table.pipeline-project-metrics tr td {
    svg g { fill: $gl-no-plan; }
  }
 }
+=======
+>>>>>>> upstream/master
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -376,6 +376,12 @@
  }
 }

+.nothing-here-block {
+  img {
+    width: 230px;
+  }
+}
+
 .mr-list {
  .merge-request {
    padding: 10px  0 10px 15px;

--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -141,20 +141,20 @@

 .sidebar-item-icon {
  border-radius: $border-radius-default;
-  margin: 0 3px 0 -4px;
-  vertical-align: middle;
+  margin: 0 5px 0 0;
+  vertical-align: text-bottom;

  &.is-active {
    fill: $orange-600;
  }
-}

-.sidebar-collapsed-icon .sidebar-item-icon {
-  margin: 0;
-}
+  .sidebar-collapsed-icon & {
+    margin: 0;
+  }

-.sidebar-item-value .sidebar-item-icon {
-  fill: $theme-gray-700;
+  .sidebar-item-value & {
+    fill: $theme-gray-700;
+  }
 }

 .sidebar-item-warning-message {

--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -4,6 +4,11 @@
  .nav-block {
    margin: 10px 0;

+    .btn .fa,
+    .btn svg {
+      color: $gl-text-color-secondary;
+    }
+
    @media (min-width: $screen-sm-min) {
      display: flex;

@@ -91,8 +96,12 @@
  }

  .add-to-tree {
-    vertical-align: middle;
-    padding: 6px 10px;
+    vertical-align: top;
+    padding: 8px;
+
+    svg {
+      top: 0;
+    }
  }

  .tree-table {

--- a/app/controllers/admin/health_check_controller.rb
+++ b/app/controllers/admin/health_check_controller.rb
@@ -8,7 +8,7 @@ class Admin::HealthCheckController < Admin::ApplicationController
  end

  def reset_storage_health
-    Gitlab::Git::Storage::CircuitBreaker.reset_all!
+    Gitlab::Git::Storage::FailureInfo.reset_all!
    redirect_to admin_health_check_path,
                notice: _('Git storage health information has been reset')
  end

--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -25,7 +25,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
  end

  def update
-    @group_member = @group.group_members.find(params[:id])
+    @group_member = @group.members_and_requesters.find(params[:id])

    return render_403 unless can?(current_user, :update_group_member, @group_member)


--- a/app/controllers/health_controller.rb
+++ b/app/controllers/health_controller.rb
 class HealthController < ActionController::Base
-  protect_from_forgery with: :exception
+  protect_from_forgery with: :exception, except: :storage_check
  include RequiresWhitelistedMonitoringClient

  CHECKS = [
@@ -23,6 +23,15 @@ class HealthController < ActionController::Base
    render_check_results(results)
  end

+  def storage_check
+    results = Gitlab::Git::Storage::Checker.check_all
+
+    render json: {
+             check_interval: Gitlab::CurrentSettings.current_application_settings.circuitbreaker_check_interval,
+             results: results
+           }
+  end
+
  private

  def render_check_results(results)

--- a/app/controllers/profiles/personal_access_tokens_controller.rb
+++ b/app/controllers/profiles/personal_access_tokens_controller.rb
@@ -8,7 +8,7 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController
    @personal_access_token = finder.build(personal_access_token_params)

    if @personal_access_token.save
-      flash[:personal_access_token] = @personal_access_token.token
+      PersonalAccessToken.redis_store!(current_user.id, @personal_access_token.token)
      redirect_to profile_personal_access_tokens_path, notice: "Your new personal access token has been created."
    else
      set_index_vars
@@ -43,5 +43,7 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController

    @inactive_personal_access_tokens = finder(state: 'inactive').execute
    @active_personal_access_tokens = finder(state: 'active').execute.order(:expires_at)
+
+    @new_personal_access_token = PersonalAccessToken.redis_getdel(current_user.id)
  end
 end
--- a/app/controllers/projects/autocomplete_sources_controller.rb
+++ b/app/controllers/projects/autocomplete_sources_controller.rb
@@ -2,7 +2,7 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
  before_action :load_autocomplete_service, except: [:members]

  def members
-    render json: ::Projects::ParticipantsService.new(@project, current_user).execute(noteable)
+    render json: ::Projects::ParticipantsService.new(@project, current_user).execute(target)
  end

  def issues
@@ -14,7 +14,7 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
  end

  def labels
-    render json: @autocomplete_service.labels
+    render json: @autocomplete_service.labels(target)
  end

  def milestones
@@ -22,7 +22,7 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
  end

  def commands
-    render json: @autocomplete_service.commands(noteable, params[:type])
+    render json: @autocomplete_service.commands(target, params[:type])
  end

  private
@@ -31,13 +31,13 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
    @autocomplete_service = ::Projects::AutocompleteService.new(@project, current_user)
  end

-  def noteable
-    case params[:type]
-    when 'Issue'
+  def target
+    case params[:type]&.downcase
+    when 'issue'
      IssuesFinder.new(current_user, project_id: @project.id).execute.find_by(iid: params[:type_id])
-    when 'MergeRequest'
+    when 'mergerequest'
      MergeRequestsFinder.new(current_user, project_id: @project.id).execute.find_by(iid: params[:type_id])
-    when 'Commit'
+    when 'commit'
      @project.commit(params[:type_id])
    end
  end

--- a/app/controllers/projects/boards_controller.rb
+++ b/app/controllers/projects/boards_controller.rb
@@ -22,7 +22,7 @@ class Projects::BoardsController < Projects::ApplicationController
  private

  def assign_endpoint_vars
-    @boards_endpoint = project_boards_url(project)
+    @boards_endpoint = project_boards_path(project)
    @bulk_issues_path = bulk_update_project_issues_path(project)
    @namespace_path = project.namespace.full_path
    @labels_endpoint = project_labels_path(project)

--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -6,8 +6,11 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
  include ToggleAwardEmoji
  include IssuableCollections

+<<<<<<< HEAD
  prepend ::EE::Projects::MergeRequestsController

+=======
+>>>>>>> upstream/master
  skip_before_action :merge_request, only: [:index, :bulk_update]
  before_action :authorize_update_issuable!, only: [:close, :edit, :update, :remove_wip, :sort]
  before_action :set_issuables_index, only: [:index]

--- a/app/controllers/projects/pipelines_settings_controller.rb
+++ b/app/controllers/projects/pipelines_settings_controller.rb
@@ -29,7 +29,6 @@ class Projects::PipelinesSettingsController < Projects::ApplicationController
      :runners_token, :builds_enabled, :build_allow_git_fetch,
      :build_timeout_in_minutes, :build_coverage_regex, :public_builds,
      :auto_cancel_pending_pipelines, :ci_config_path,
-      :run_auto_devops_pipeline_implicit, :run_auto_devops_pipeline_explicit,
      auto_devops_attributes: [:id, :domain, :enabled]
    )
  end

--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -26,7 +26,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
  end

  def update
-    @project_member = @project.project_members.find(params[:id])
+    @project_member = @project.members_and_requesters.find(params[:id])

    return render_403 unless can?(current_user, :update_project_member, @project_member)


--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -125,17 +125,6 @@ module ApplicationSettingsHelper
    _('The number of attempts GitLab will make to access a storage.')
  end

-  def circuitbreaker_backoff_threshold_help_text
-    _("The number of failures after which GitLab will start temporarily "\
-      "disabling access to a storage shard on a host")
-  end
-
-  def circuitbreaker_failure_wait_time_help_text
-    _("When access to a storage fails. GitLab will prevent access to the "\
-      "storage for the time specified here. This allows the filesystem to "\
-      "recover. Repositories on failing shards are temporarly unavailable")
-  end
-
  def circuitbreaker_failure_reset_time_help_text
    _("The time in seconds GitLab will keep failure information. When no "\
      "failures occur during this time, information about the mount is reset.")
@@ -146,6 +135,11 @@ module ApplicationSettingsHelper
      "timeout error will be raised.")
  end

+  def circuitbreaker_check_interval_help_text
+    _("The time in seconds between storage checks. When a previous check did "\
+      "complete yet, GitLab will skip a check.")
+  end
+
  def visible_attributes
    [
      :admin_notification_email,
@@ -155,10 +149,9 @@ module ApplicationSettingsHelper
      :akismet_enabled,
      :auto_devops_enabled,
      :circuitbreaker_access_retries,
-      :circuitbreaker_backoff_threshold,
+      :circuitbreaker_check_interval,
      :circuitbreaker_failure_count_threshold,
      :circuitbreaker_failure_reset_time,
-      :circuitbreaker_failure_wait_time,
      :circuitbreaker_storage_timeout,
      :clientside_sentry_dsn,
      :clientside_sentry_enabled,

--- a/app/helpers/auto_devops_helper.rb
+++ b/app/helpers/auto_devops_helper.rb
@@ -8,22 +8,6 @@ module AutoDevopsHelper
      !project.ci_service
  end

-  def show_run_auto_devops_pipeline_checkbox_for_instance_setting?(project)
-    return false if project.repository.gitlab_ci_yml
-
-    if project&.auto_devops&.enabled.present?
-      !project.auto_devops.enabled && current_application_settings.auto_devops_enabled?
-    else
-      current_application_settings.auto_devops_enabled?
-    end
-  end
-
-  def show_run_auto_devops_pipeline_checkbox_for_explicit_setting?(project)
-    return false if project.repository.gitlab_ci_yml
-
-    !project.auto_devops_enabled?
-  end
-
  def auto_devops_warning_message(project)
    missing_domain = !project.auto_devops&.has_domain?
    missing_service = !project.deployment_platform&.active?

--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@@ -8,7 +8,7 @@ module BoardsHelper
  def board_data
    {
      boards_endpoint: @boards_endpoint,
-      lists_endpoint: board_lists_url(board),
+      lists_endpoint: board_lists_path(board),
      board_id: board.id,
      disabled: "#{!can?(current_user, :admin_list, current_board_parent)}",
      issue_link_base: build_issue_link_base,

--- a/app/helpers/graph_helper.rb
+++ b/app/helpers/graph_helper.rb
@@ -8,7 +8,7 @@ module GraphHelper

    # append note count
    notes_count = @graph.notes[commit.id]
-    refs << "[#{notes_count} #{pluralize(notes_count, 'note')}]" if notes_count > 0
+    refs << "[#{pluralize(notes_count, 'note')}]" if notes_count > 0

    refs
  end

--- a/app/helpers/storage_health_helper.rb
+++ b/app/helpers/storage_health_helper.rb
@@ -18,16 +18,12 @@ module StorageHealthHelper
    current_failures = circuit_breaker.failure_count

    translation_params = { number_of_failures: current_failures,
-                           maximum_failures: maximum_failures,
-                           number_of_seconds: circuit_breaker.failure_wait_time }
+                           maximum_failures: maximum_failures }

    if circuit_breaker.circuit_broken?
      s_("%{number_of_failures} of %{maximum_failures} failures. GitLab will not "\
         "retry automatically. Reset storage information when the problem is "\
         "resolved.") % translation_params
-    elsif circuit_breaker.backing_off?
-      _("%{number_of_failures} of %{maximum_failures} failures. GitLab will "\
-        "block access for %{number_of_seconds} seconds.") % translation_params
    else
      _("%{number_of_failures} of %{maximum_failures} failures. GitLab will "\
        "allow access on the next attempt.") % translation_params

--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -166,11 +166,10 @@ class ApplicationSetting < ActiveRecord::Base
            presence: true,
            numericality: { greater_than_or_equal_to: 0 }

-  validates :circuitbreaker_backoff_threshold,
-            :circuitbreaker_failure_count_threshold,
-            :circuitbreaker_failure_wait_time,
+  validates :circuitbreaker_failure_count_threshold,
            :circuitbreaker_failure_reset_time,
            :circuitbreaker_storage_timeout,
+            :circuitbreaker_check_interval,
            presence: true,
            numericality: { only_integer: true, greater_than_or_equal_to: 0 }

@@ -178,13 +177,6 @@ class ApplicationSetting < ActiveRecord::Base
            presence: true,
            numericality: { only_integer: true, greater_than_or_equal_to: 1 }

-  validates_each :circuitbreaker_backoff_threshold do |record, attr, value|
-    if value.to_i >= record.circuitbreaker_failure_count_threshold
-      record.errors.add(attr, _("The circuitbreaker backoff threshold should be "\
-                                "lower than the failure count threshold"))
-    end
-  end
-
  validates :gitaly_timeout_default,
            presence: true,
            numericality: { only_integer: true, greater_than_or_equal_to: 0 }

--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -7,6 +7,8 @@ module Ci
    include Importable
    prepend EE::Ci::Build

+    MissingDependenciesError = Class.new(StandardError)
+
    belongs_to :runner
    belongs_to :trigger_request
    belongs_to :erased_by, class_name: 'User'
@@ -143,6 +145,10 @@ module Ci
          Ci::Build.retry(build, build.user)
        end
      end
+
+      before_transition any => [:running] do |build|
+        build.validates_dependencies! unless Feature.enabled?('ci_disable_validates_dependencies')
+      end
    end

    def detailed_status(current_user)
@@ -488,6 +494,20 @@ module Ci
      options[:dependencies]&.empty?
    end

+    def validates_dependencies!
+      dependencies.each do |dependency|
+        raise MissingDependenciesError unless dependency.valid_dependency?
+      end
+    end
+
+    def valid_dependency?
+      return false unless complete?
+      return false if artifacts_expired?
+      return false if erased?
+
+      true
+    end
+
    def hide_secrets(trace)
      return unless trace


--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -43,7 +43,8 @@ class CommitStatus < ActiveRecord::Base
    script_failure: 1,
    api_failure: 2,
    stuck_or_timeout_failure: 3,
-    runner_system_failure: 4
+    runner_system_failure: 4,
+    missing_dependency_failure: 5
  }

  ##

--- a/app/models/concerns/throttled_touch.rb
+++ b/app/models/concerns/throttled_touch.rb
+# ThrottledTouch can be used to throttle the number of updates triggered by
+# calling "touch" on an ActiveRecord model.
+module ThrottledTouch
+  # The amount of time to wait before "touch" can update a record again.
+  TOUCH_INTERVAL = 1.minute
+
+  def touch(*args)
+    super if (Time.zone.now - updated_at) > TOUCH_INTERVAL
+  end
+end
--- a/app/models/epic.rb
+++ b/app/models/epic.rb
 # Placeholder class for model that is implemented in EE
 # It reserves '&' as a reference prefix, but the table does not exists in CE
 class Epic < ActiveRecord::Base
+<<<<<<< HEAD
  prepend EE::Epic

+=======
+>>>>>>> upstream/master
  def self.reference_prefix
    '&'
  end

--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -72,7 +72,7 @@ class Event < ActiveRecord::Base
    # We're using preload for "push_event_payload" as otherwise the association
    # is not always available (depending on the query being built).
    includes(:author, :project, project: :namespace)
-      .preload(:target, :push_event_payload)
+      .preload(:push_event_payload, target: :author)
  end

  scope :for_milestone_id, ->(milestone_id) { where(target_type: "Milestone", target_id: milestone_id) }

--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -13,6 +13,10 @@ class Issue < ActiveRecord::Base
  include FasterCacheKeys
  include RelativePositioning
  include TimeTrackable
+  include ThrottledTouch
+  include IgnorableColumn
+
+  ignore_column :assignee_id

  WEIGHT_RANGE = 1..9
  WEIGHT_ALL = 'Everything'.freeze

--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -8,6 +8,7 @@ class MergeRequest < ActiveRecord::Base
  include TimeTrackable
  include ManualInverseAssociation
  include EachBatch
+  include ThrottledTouch

  ignore_column :locked_at,
                :ref_fetched

--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -18,6 +18,7 @@ class Note < ActiveRecord::Base
  include IgnorableColumn
  include Editable
  include Gitlab::SQL::Pattern
+  include ThrottledTouch

  module SpecialRole
    FIRST_TIME_CONTRIBUTOR = :first_time_contributor
@@ -58,7 +59,7 @@ class Note < ActiveRecord::Base
  participant :author

  belongs_to :project
-  belongs_to :noteable, polymorphic: true, touch: true # rubocop:disable Cop/PolymorphicAssociations
+  belongs_to :noteable, polymorphic: true # rubocop:disable Cop/PolymorphicAssociations
  belongs_to :author, class_name: "User"
  belongs_to :updated_by, class_name: "User"
  belongs_to :last_edited_by, class_name: 'User'
@@ -122,6 +123,7 @@ class Note < ActiveRecord::Base
  before_validation :set_discussion_id, on: :create
  after_save :keep_around_commit, if: :for_project_noteable?
  after_save :expire_etag_cache
+  after_save :touch_noteable
  after_destroy :expire_etag_cache

  class << self

--- a/app/models/personal_access_token.rb
+++ b/app/models/personal_access_token.rb
@@ -3,6 +3,8 @@ class PersonalAccessToken < ActiveRecord::Base
  include TokenAuthenticatable
  add_authentication_token_field :token

+  REDIS_EXPIRY_TIME = 3.minutes
+
  serialize :scopes, Array # rubocop:disable Cop/ActiveRecordSerialize

  belongs_to :user
@@ -27,6 +29,21 @@ class PersonalAccessToken < ActiveRecord::Base
    !revoked? && !expired?
  end

+  def self.redis_getdel(user_id)
+    Gitlab::Redis::SharedState.with do |redis|
+      token = redis.get(redis_shared_state_key(user_id))
+      redis.del(redis_shared_state_key(user_id))
+      token
+    end
+  end
+
+  def self.redis_store!(user_id, token)
+    Gitlab::Redis::SharedState.with do |redis|
+      redis.set(redis_shared_state_key(user_id), token, ex: REDIS_EXPIRY_TIME)
+      token
+    end
+  end
+
  protected

  def validate_scopes
@@ -38,4 +55,8 @@ class PersonalAccessToken < ActiveRecord::Base
  def set_default_scopes
    self.scopes = Gitlab::Auth::DEFAULT_SCOPES if self.scopes.empty?
  end
+
+  def self.redis_shared_state_key(user_id)
+    "gitlab:personal_access_token:#{user_id}"
+  end
 end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,9 +18,12 @@ class User < ActiveRecord::Base
  include CreatedAtFilterable
  include IgnorableColumn
  include BulkMemberAccessLoad
+<<<<<<< HEAD

  prepend EE::GeoAwareAvatar
  prepend EE::User
+=======
+>>>>>>> upstream/master

  DEFAULT_NOTIFICATION_LEVEL = :participating

@@ -1084,13 +1087,13 @@ class User < ActiveRecord::Base
  end

  def todos_done_count(force: false)
-    Rails.cache.fetch(['users', id, 'todos_done_count'], force: force) do
+    Rails.cache.fetch(['users', id, 'todos_done_count'], force: force, expires_in: 20.minutes) do
      TodosFinder.new(self, state: :done).execute.count
    end
  end

  def todos_pending_count(force: false)
-    Rails.cache.fetch(['users', id, 'todos_pending_count'], force: force) do
+    Rails.cache.fetch(['users', id, 'todos_pending_count'], force: force, expires_in: 20.minutes) do
      TodosFinder.new(self, state: :pending).execute.count
    end
  end

--- a/app/policies/group_policy.rb
+++ b/app/policies/group_policy.rb
@@ -39,7 +39,10 @@ class GroupPolicy < BasePolicy

  rule { guest }.policy do
    enable :read_group
+<<<<<<< HEAD
    enable :read_list
+=======
+>>>>>>> upstream/master
    enable :upload_file
  end


--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -26,11 +26,15 @@ module Ci
        save_incompleted: save_on_errors,
        seeds_block: block,
        project: project,
+<<<<<<< HEAD
        current_user: current_user,

        # EE specific
        allow_mirror_update: mirror_update
      )
+=======
+        current_user: current_user)
+>>>>>>> upstream/master

      sequence = Gitlab::Ci::Pipeline::Chain::Sequence
        .new(pipeline, command, SEQUENCE)

--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -55,6 +55,9 @@ module Ci
          # we still have to return 409 in the end,
          # to make sure that this is properly handled by runner.
          valid = false
+        rescue Ci::Build::MissingDependenciesError
+          build.drop!(:missing_dependency_failure)
+          valid = false
        end
      end


--- a/app/services/metrics_service.rb
+++ b/app/services/metrics_service.rb
@@ -20,7 +20,7 @@ class MetricsService
  end

  def metrics_text
-    "#{health_metrics_text}#{prometheus_metrics_text}"
+    prometheus_metrics_text.concat(health_metrics_text)
  end

  private

--- a/app/services/projects/autocomplete_service.rb
+++ b/app/services/projects/autocomplete_service.rb
@@ -20,8 +20,23 @@ module Projects
      MergeRequestsFinder.new(current_user, project_id: project.id, state: 'opened').execute.select([:iid, :title])
    end

-    def labels
-      LabelsFinder.new(current_user, project_id: project.id).execute.select([:title, :color])
+    def labels(target = nil)
+      labels = LabelsFinder.new(current_user, project_id: project.id).execute.select([:color, :title])
+
+      return labels unless target&.respond_to?(:labels)
+
+      issuable_label_titles = target.labels.pluck(:title)
+
+      if issuable_label_titles
+        labels = labels.as_json(only: [:title, :color])
+
+        issuable_label_titles.each do |issuable_label_title|
+          found_label = labels.find { |label| label['title'] == issuable_label_title }
+          found_label[:set] = true if found_label
+        end
+      end
+
+      labels
    end

    def commands(noteable, type)
@@ -33,7 +48,7 @@ module Projects
          @project.merge_requests.build
        end

-      return [] unless noteable && noteable.is_a?(Issuable)
+      return [] unless noteable&.is_a?(Issuable)

      opts = {
        project: project,

--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -25,7 +25,7 @@ module Projects
        return error("Could not set the default branch") unless project.change_head(params[:default_branch])
      end

-      if project.update_attributes(update_params)
+      if project.update_attributes(params.except(:default_branch))
        if project.previous_changes.include?('path')
          project.rename_repo
        else
@@ -42,15 +42,13 @@ module Projects
    end

    def run_auto_devops_pipeline?
-      params.dig(:run_auto_devops_pipeline_explicit) == 'true' || params.dig(:run_auto_devops_pipeline_implicit) == 'true'
+      return false if project.repository.gitlab_ci_yml || !project.auto_devops.previous_changes.include?('enabled')
+
+      project.auto_devops.enabled? || (project.auto_devops.enabled.nil? && current_application_settings.auto_devops_enabled?)
    end

    private

-    def update_params
-      params.except(:default_branch, :run_auto_devops_pipeline_explicit, :run_auto_devops_pipeline_implicit)
-    end
-
    def renaming_project_with_container_registry_tags?
      new_path = params[:path]


--- a/app/services/protected_branches/access_level_params.rb
+++ b/app/services/protected_branches/access_level_params.rb
 module ProtectedBranches
  class AccessLevelParams
+<<<<<<< HEAD
    prepend EE::ProtectedBranches::AccessLevelParams

+=======
+>>>>>>> upstream/master
    attr_reader :type, :params

    def initialize(type, params)

--- a/app/services/protected_branches/api_service.rb
+++ b/app/services/protected_branches/api_service.rb
 module ProtectedBranches
  class ApiService < BaseService
+<<<<<<< HEAD
    prepend EE::ProtectedBranches::ApiService

+=======
+>>>>>>> upstream/master
    def create
      @push_params = AccessLevelParams.new(:push, params)
      @merge_params = AccessLevelParams.new(:merge, params)

--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -582,6 +582,12 @@

  %fieldset
    %legend Git Storage Circuitbreaker settings
+    .form-group
+      = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.number_field :circuitbreaker_check_interval, class: 'form-control'
+        .help-block
+          = circuitbreaker_check_interval_help_text
    .form-group
      = f.label :circuitbreaker_access_retries, _('Number of access attempts'), class: 'control-label col-sm-2'
      .col-sm-10
@@ -594,18 +600,6 @@
        = f.number_field :circuitbreaker_storage_timeout, class: 'form-control'
        .help-block
          = circuitbreaker_storage_timeout_help_text
-    .form-group
-      = f.label :circuitbreaker_backoff_threshold, _('Number of failures before backing off'), class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.number_field :circuitbreaker_backoff_threshold, class: 'form-control'
-        .help-block
-          = circuitbreaker_backoff_threshold_help_text
-    .form-group
-      = f.label :circuitbreaker_failure_wait_time, _('Seconds to wait after a storage failure'), class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.number_field :circuitbreaker_failure_wait_time, class: 'form-control'
-        .help-block
-          = circuitbreaker_failure_wait_time_help_text
    .form-group
      = f.label :circuitbreaker_failure_count_threshold, _('Maximum git storage failures'), class: 'control-label col-sm-2'
      .col-sm-10

--- a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
+++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
@@ -10,7 +10,7 @@
          Projects are where you store your code, access issues, wiki and other features of GitLab.

  - if current_user.can_create_group?
-    = link_to admin_root_path, class: "blank-state-link" do
+    = link_to new_group_path, class: "blank-state-link" do
      .blank-state
        .blank-state-icon
          = custom_icon("add_new_group", size: 50)

--- a/app/views/layouts/_init_auto_complete.html.haml
+++ b/app/views/layouts/_init_auto_complete.html.haml
@@ -10,7 +10,7 @@
      members: "#{members_project_autocomplete_sources_path(project, type: noteable_type, type_id: params[:id])}",
      issues: "#{issues_project_autocomplete_sources_path(project)}",
      mergeRequests: "#{merge_requests_project_autocomplete_sources_path(project)}",
-      labels: "#{labels_project_autocomplete_sources_path(project)}",
+      labels: "#{labels_project_autocomplete_sources_path(project, type: noteable_type, type_id: params[:id])}",
      milestones: "#{milestones_project_autocomplete_sources_path(project)}",
      commands: "#{commands_project_autocomplete_sources_path(project, type: noteable_type, type_id: params[:id])}"
    };
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -2,6 +2,7 @@
  - if defined?(nav) && nav
    = render "layouts/nav/sidebar/#{nav}"
  .content-wrapper.page-with-new-nav
+    = render 'shared/outdated_browser'
    .mobile-overlay
    .alert-wrapper
      = render "layouts/header/ee_license_banner"

--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -18,10 +18,17 @@
                                            spellcheck: false,
                                            tabindex: '1',
                                            autocomplete: 'off',
+<<<<<<< HEAD
                                            data: { toggle: 'dropdown',
                                              issues_path: issues_dashboard_path,
                                              mr_path: merge_requests_dashboard_path },
                                            aria: { label: 'Search' }
+=======
+                                            data: { issues_path: issues_dashboard_path,
+                                              mr_path: merge_requests_dashboard_path },
+                                            aria: { label: 'Search' }
+          %button.hidden.js-dropdown-search-toggle{ type: 'button', data: { toggle: 'dropdown' } }
+>>>>>>> upstream/master
          .dropdown-menu.dropdown-select
            = dropdown_content do
              %ul

--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -75,5 +75,3 @@
        %span.sr-only Toggle navigation
        = sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right')
        = sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left')
-
-= render 'shared/outdated_browser'
--- a/app/views/layouts/nav/sidebar/_group.html.haml
+++ b/app/views/layouts/nav/sidebar/_group.html.haml
 - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
 - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute

+<<<<<<< HEAD
 - issues_sub_menu_items = ['groups#issues', 'labels#index', 'milestones#index']
 - if @group.feature_available?(:group_issue_boards)
  - issues_sub_menu_items.push('boards#index', 'boards#show')

+=======
+>>>>>>> upstream/master
 .nav-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?) }
  .nav-sidebar-inner-scroll
    .context-header

--- a/app/views/profiles/personal_access_tokens/index.html.haml
+++ b/app/views/profiles/personal_access_tokens/index.html.haml
@@ -15,14 +15,13 @@
      They are the only accepted password when you have Two-Factor Authentication (2FA) enabled.

  .col-lg-8
-
-    - if flash[:personal_access_token]
+    - if @new_personal_access_token
      .created-personal-access-token-container
        %h5.prepend-top-0
          Your New Personal Access Token
        .form-group
-          = text_field_tag 'created-personal-access-token', flash[:personal_access_token], readonly: true, class: "form-control js-select-on-focus", 'aria-describedby' => "created-personal-access-token-help-block"
-          = clipboard_button(text: flash[:personal_access_token], title: "Copy personal access token to clipboard", placement: "left")
+          = text_field_tag 'created-personal-access-token', @new_personal_access_token, readonly: true, class: "form-control js-select-on-focus", 'aria-describedby' => "created-personal-access-token-help-block"
+          = clipboard_button(text: @new_personal_access_token, title: "Copy personal access token to clipboard", placement: "left")
          %span#created-personal-access-token-help-block.help-block.text-danger Make sure you save it - you won't be able to access it again.

      %hr

--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@@ -2,7 +2,7 @@

 - if defined?(@merge_request) && @merge_request.discussion_locked?
  .issuable-note-warning
-    = icon('lock', class: 'icon')
+    = sprite_icon('lock', size: 16, css_class: 'icon')
    %span
      = _('This merge request is locked.')
      = _('Only project members can comment.')

--- a/app/views/projects/clusters/_advanced_settings.html.haml
+++ b/app/views/projects/clusters/_advanced_settings.html.haml
@@ -2,14 +2,14 @@
  - if @cluster.managed?
    .append-bottom-20
      %label.append-bottom-10
-        = s_('ClusterIntegration|Google Container Engine')
+        = s_('ClusterIntegration|Google Kubernetes Engine')
      %p
-        - link_gke = link_to(s_('ClusterIntegration|Google Container Engine'), @cluster.gke_cluster_url, target: '_blank', rel: 'noopener noreferrer')
+        - link_gke = link_to(s_('ClusterIntegration|Google Kubernetes Engine'), @cluster.gke_cluster_url, target: '_blank', rel: 'noopener noreferrer')
        = s_('ClusterIntegration|Manage your cluster by visiting %{link_gke}').html_safe % { link_gke: link_gke }

  .well.form-group
    %label.text-danger
      = s_('ClusterIntegration|Remove cluster integration')
    %p
-      = s_('ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your cluster on Google Container Engine.')
-    = link_to(s_('ClusterIntegration|Remove integration'), namespace_project_cluster_path(@project.namespace, @project, @cluster.id), method: :delete, class: 'btn btn-danger', data: { confirm: "Are you sure you want to remove cluster integration from this project? This will not delete your cluster on Google Container Engine"})
+      = s_('ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your cluster on Google Kubernetes Engine.')
+    = link_to(s_('ClusterIntegration|Remove integration'), namespace_project_cluster_path(@project.namespace, @project, @cluster.id), method: :delete, class: 'btn btn-danger', data: { confirm: "Are you sure you want to remove cluster integration from this project? This will not delete your cluster on Google Kubernetes Engine"})
--- a/app/views/projects/clusters/_banner.html.haml
+++ b/app/views/projects/clusters/_banner.html.haml
@@ -2,14 +2,14 @@
 .settings-content

  .hidden.js-cluster-error.alert.alert-danger.alert-block.append-bottom-10{ role: 'alert' }
-    = s_('ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine')
+    = s_('ClusterIntegration|Something went wrong while creating your cluster on Google Kubernetes Engine')
    %p.js-error-reason

  .hidden.js-cluster-creating.alert.alert-info.alert-block.append-bottom-10{ role: 'alert' }
-    = s_('ClusterIntegration|Cluster is being created on Google Container Engine...')
+    = s_('ClusterIntegration|Cluster is being created on Google Kubernetes Engine...')

  .hidden.js-cluster-success.alert.alert-success.alert-block.append-bottom-10{ role: 'alert' }
-    = s_('ClusterIntegration|Cluster was successfully created on Google Container Engine. Refresh the page to see cluster\'s details')
+    = s_('ClusterIntegration|Cluster was successfully created on Google Kubernetes Engine. Refresh the page to see cluster\'s details')

  %p
    - if @cluster.enabled?

--- a/app/views/projects/clusters/_dropdown.html.haml
+++ b/app/views/projects/clusters/_dropdown.html.haml
@@ -7,6 +7,6 @@
    = icon('chevron-down')
  %ul.dropdown-menu.clusters-dropdown-menu.dropdown-menu-full-width
    %li
-      = link_to(s_('ClusterIntegration|Create cluster on Google Container Engine'), gcp_new_namespace_project_clusters_path(@project.namespace, @project))
+      = link_to(s_('ClusterIntegration|Create cluster on Google Kubernetes Engine'), gcp_new_namespace_project_clusters_path(@project.namespace, @project))
    %li
      = link_to(s_('ClusterIntegration|Add an existing cluster'), user_new_namespace_project_clusters_path(@project.namespace, @project))
--- a/app/views/projects/clusters/gcp/_header.html.haml
+++ b/app/views/projects/clusters/gcp/_header.html.haml
@@ -4,11 +4,11 @@
  = s_('ClusterIntegration|Please make sure that your Google account meets the following requirements:')
 %ul
  %li
-    - link_to_container_engine = link_to(s_('ClusterIntegration|access to Google Container Engine'), 'https://console.cloud.google.com', target: '_blank', rel: 'noopener noreferrer')
-    = s_('ClusterIntegration|Your account must have %{link_to_container_engine}').html_safe % { link_to_container_engine: link_to_container_engine }
+    - link_to_kubernetes_engine = link_to(s_('ClusterIntegration|access to Google Kubernetes Engine'), 'https://console.cloud.google.com', target: '_blank', rel: 'noopener noreferrer')
+    = s_('ClusterIntegration|Your account must have %{link_to_kubernetes_engine}').html_safe % { link_to_kubernetes_engine: link_to_kubernetes_engine }
    %li
-      - link_to_requirements = link_to(s_('ClusterIntegration|meets the requirements'), 'https://cloud.google.com/container-engine/docs/quickstart', target: '_blank', rel: 'noopener noreferrer')
+      - link_to_requirements = link_to(s_('ClusterIntegration|meets the requirements'), 'https://cloud.google.com/kubernetes-engine/docs/quickstart', target: '_blank', rel: 'noopener noreferrer')
      = s_('ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters').html_safe % { link_to_requirements: link_to_requirements }
    %li
-      - link_to_container_project = link_to(s_('ClusterIntegration|Google Container Engine project'), target: '_blank', rel: 'noopener noreferrer')
+      - link_to_container_project = link_to(s_('ClusterIntegration|Google Kubernetes Engine project'), target: '_blank', rel: 'noopener noreferrer')
      = s_('ClusterIntegration|This account must have permissions to create a cluster in the %{link_to_container_project} specified below').html_safe % { link_to_container_project: link_to_container_project }
--- a/app/views/projects/clusters/gcp/login.html.haml
+++ b/app/views/projects/clusters/gcp/login.html.haml
@@ -5,7 +5,7 @@
  .col-sm-4
    = render 'projects/clusters/sidebar'
  .col-sm-8
-    = render 'projects/clusters/dropdown', dropdown_text: s_('ClusterIntegration|Create cluster on Google Container Engine')
+    = render 'projects/clusters/dropdown', dropdown_text: s_('ClusterIntegration|Create cluster on Google Kubernetes Engine')
    = render 'header'
 .row
  .col-sm-8.col-sm-offset-4.signin-with-google

--- a/app/views/projects/clusters/gcp/new.html.haml
+++ b/app/views/projects/clusters/gcp/new.html.haml
@@ -5,6 +5,6 @@
  .col-sm-4
    = render 'projects/clusters/sidebar'
  .col-sm-8
-    = render 'projects/clusters/dropdown', dropdown_text: s_('ClusterIntegration|Create cluster on Google Container Engine')
+    = render 'projects/clusters/dropdown', dropdown_text: s_('ClusterIntegration|Create cluster on Google Kubernetes Engine')
    = render 'header'
    = render 'form'
--- a/app/views/projects/clusters/new.html.haml
+++ b/app/views/projects/clusters/new.html.haml
@@ -7,7 +7,7 @@
  .col-sm-8
    %h4.prepend-top-0= s_('ClusterIntegration|Choose how to set up cluster integration')

-    %p= s_('ClusterIntegration|Create a new cluster on Google Engine right from GitLab')
+    %p= s_('ClusterIntegration|Create a new cluster on Google Kubernetes Engine right from GitLab')
    = link_to s_('ClusterIntegration|Create on GKE'), gcp_new_namespace_project_clusters_path(@project.namespace, @project), class: 'btn append-bottom-20'
    %p= s_('ClusterIntegration|Enter the details for an existing Kubernetes cluster')
    = link_to s_('ClusterIntegration|Add an existing cluster'), user_new_namespace_project_clusters_path(@project.namespace, @project), class: 'btn append-bottom-20'
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -13,10 +13,13 @@
               view_details,
               commit.status(ref),
               I18n.locale].compact
+<<<<<<< HEAD

 -# EE-only
 - show_project_name = local_assigns.fetch(:show_project_name, false)
 - cache_key << show_project_name
+=======
+>>>>>>> upstream/master

 = cache(cache_key, expires_in: 1.day) do
  %li.commit.flex-row.js-toggle-container{ id: "commit-#{commit.short_id}" }

--- a/app/views/projects/environments/metrics.html.haml
+++ b/app/views/projects/environments/metrics.html.haml
@@ -19,4 +19,6 @@
    "empty-loading-svg-path": image_path('illustrations/monitoring/loading'),
    "empty-unable-to-connect-svg-path": image_path('illustrations/monitoring/unable_to_connect'),
    "additional-metrics": additional_metrics_project_environment_path(@project, @environment, format: :json),
+    "project-path": project_path(@project),
+    "tags-path": project_tags_path(@project),
    "has-metrics": "#{@environment.has_metrics?}", deployment_endpoint: project_environment_deployments_path(@project, @environment, format: :json) } }
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -77,6 +77,7 @@

      = edited_time_ago_with_tooltip(@issue, placement: 'bottom', html_class: 'issue-edited-ago js-issue-edited-ago')

+<<<<<<< HEAD
    - if can?(current_user, :read_issue_link, @project)
      .js-related-issues-root{ data: { endpoint: project_issue_links_path(@project, @issue),
        can_add_related_issues: "#{can?(current_user, :admin_issue_link, @issue)}",
@@ -88,6 +89,8 @@
                Related issues


+=======
+>>>>>>> upstream/master
    #merge-requests{ data: { url: referenced_merge_requests_project_issue_path(@project, @issue) } }
      // This element is filled in using JavaScript.


--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -18,7 +18,8 @@
        A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), #{link_to 'among other things', help_page_path("user/project/index.md", anchor: "projects-features"), target: '_blank'}.
      %p
        All features are enabled when you create a project, but you can disable the ones you don’t need in the project settings.
-      = brand_new_project_guidelines
+      .md
+        = brand_new_project_guidelines
    .col-lg-9.js-toggle-container
      %ul.nav-links.gitlab-tabs{ role: 'tablist' }
        %li.active{ role: 'presentation' }

--- a/app/views/projects/pipelines_settings/_show.html.haml
+++ b/app/views/projects/pipelines_settings/_show.html.haml
@@ -6,46 +6,35 @@
          %h5 Auto DevOps (Beta)
          %p
            Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.
-            This will happen starting with the next event (e.g.: push) that occurs to the project.
            = link_to 'Learn more about Auto DevOps', help_page_path('topics/autodevops/index.md')
            - message = auto_devops_warning_message(@project)
            - if message
              %p.settings-message.text-center
                = message.html_safe
          = f.fields_for :auto_devops_attributes, @auto_devops do |form|
-            .radio.js-auto-devops-enable-radio-wrapper
+            .radio
              = form.label :enabled_true do
-                = form.radio_button :enabled, 'true', class: 'js-auto-devops-enable-radio'
+                = form.radio_button :enabled, 'true'
                %strong Enable Auto DevOps
                %br
                %span.descr
                  The Auto DevOps pipeline configuration will be used when there is no <code>.gitlab-ci.yml</code> in the project.
-                - if show_run_auto_devops_pipeline_checkbox_for_explicit_setting?(@project)
-                  .checkbox.hide.js-run-auto-devops-pipeline-checkbox-wrapper
-                    = label_tag 'project[run_auto_devops_pipeline_explicit]' do
-                      = check_box_tag 'project[run_auto_devops_pipeline_explicit]', true, false, class: 'js-run-auto-devops-pipeline-checkbox'
-                      = s_('ProjectSettings|Immediately run a pipeline on the default branch')

-            .radio.js-auto-devops-enable-radio-wrapper
+            .radio
              = form.label :enabled_false do
-                = form.radio_button :enabled, 'false', class: 'js-auto-devops-enable-radio'
+                = form.radio_button :enabled, 'false'
                %strong Disable Auto DevOps
                %br
                %span.descr
                  An explicit <code>.gitlab-ci.yml</code> needs to be specified before you can begin using Continuous Integration and Delivery.

-            .radio.js-auto-devops-enable-radio-wrapper
+            .radio
              = form.label :enabled_ do
-                = form.radio_button :enabled, '', class: 'js-auto-devops-enable-radio'
+                = form.radio_button :enabled, ''
                %strong Instance default (#{current_application_settings.auto_devops_enabled? ? 'enabled' : 'disabled'})
                %br
                %span.descr
                  Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific <code>.gitlab-ci.yml</code>.
-                - if show_run_auto_devops_pipeline_checkbox_for_instance_setting?(@project)
-                  .checkbox.hide.js-run-auto-devops-pipeline-checkbox-wrapper
-                    = label_tag 'project[run_auto_devops_pipeline_implicit]' do
-                      = check_box_tag 'project[run_auto_devops_pipeline_implicit]', true, false, class: 'js-run-auto-devops-pipeline-checkbox'
-                      = s_('ProjectSettings|Immediately run a pipeline on the default branch')
            %p
              You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.
            = form.text_field :domain, class: 'form-control', placeholder: 'domain.com'

--- a/app/views/projects/tree/_old_tree_header.html.haml
+++ b/app/views/projects/tree/_old_tree_header.html.haml
+- if on_top_of_branch?
+  - addtotree_toggle_attributes = { href: '#', 'data-toggle': 'dropdown', 'data-target': '.add-to-tree-dropdown' }
+- else
+  - addtotree_toggle_attributes = { title: _("You can only add files when you are on a branch"), data: { container: 'body' }, class: 'disabled has-tooltip' }
+
 %ul.breadcrumb.repo-breadcrumb
  %li
    = link_to project_tree_path(@project, @ref) do
@@ -8,13 +13,10 @@

  - if current_user
    %li
-      - if !on_top_of_branch?
-        %span.btn.add-to-tree.disabled.has-tooltip{ title: _("You can only add files when you are on a branch"), data: { container: 'body' } }
-          = icon('plus')
-      - else
-        %span.dropdown
-          %a.dropdown-toggle.btn.add-to-tree{ href: '#', "data-toggle" => "dropdown", "data-target" => ".add-to-tree-dropdown" }
-            = icon('plus')
+      %a.btn.add-to-tree{ addtotree_toggle_attributes }
+        = sprite_icon('plus', size: 16, css_class: 'pull-left')
+        = sprite_icon('arrow-down', size: 16, css_class: 'pull-left')
+      - if on_top_of_branch?
        .add-to-tree-dropdown
          %ul.dropdown-menu
            - if can_edit_tree?

--- a/app/views/shared/_outdated_browser.html.haml
+++ b/app/views/shared/_outdated_browser.html.haml
 - if outdated_browser?
+<<<<<<< HEAD
  .browser-alert
    GitLab may not work properly because you are using an outdated web browser.
    %br
    Please install a
    = link_to 'supported web browser', help_page_path('install/requirements', anchor: 'supported-web-browsers')
    for a better experience.
+=======
+  .flash-container
+    .flash-alert.text-center
+      GitLab may not work properly because you are using an outdated web browser.
+      %br
+      Please install a
+      = link_to 'supported web browser', help_page_path('install/requirements', anchor: 'supported-web-browsers')
+      for a better experience.
+>>>>>>> upstream/master
--- a/app/views/shared/notes/_notes_with_form.html.haml
+++ b/app/views/shared/notes/_notes_with_form.html.haml
@@ -27,7 +27,7 @@
 - elsif discussion_locked
  .disabled-comment.text-center.prepend-top-default
    %span.issuable-note-warning
-      %span.icon= sprite_icon('lock', size: 14)
+      = sprite_icon('lock', size: 16, css_class: 'icon')
      %span
        This
        = issuable.class.to_s.titleize.downcase

--- a/bin/storage_check
+++ b/bin/storage_check
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'net/http'
+require 'json'
+require 'socket'
+require 'logger'
+
+require_relative '../lib/gitlab/storage_check'
+
+Gitlab::StorageCheck::CLI.start!(ARGV)
--- a/changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml
+++ b/changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml
+---
+title: 'fix #39233 - 500 in merge request'
+merge_request: 15774
+author: Martin Nowak
+type: fixed
--- a/changelogs/unreleased/15832-fix-access-level-update-for-requesters.yml
+++ b/changelogs/unreleased/15832-fix-access-level-update-for-requesters.yml
--- a/changelogs/unreleased/22680-unlabel-slash-command-limit-autocomplete-to-applied-labels.yml
+++ b/changelogs/unreleased/22680-unlabel-slash-command-limit-autocomplete-to-applied-labels.yml
--- a/changelogs/unreleased/38032-deploy-markers-should-be-more-verbose.yml
+++ b/changelogs/unreleased/38032-deploy-markers-should-be-more-verbose.yml
--- a/changelogs/unreleased/39364-in-issue-board-url-doesn-t-take-in-account-hostname-settings.yml
+++ b/changelogs/unreleased/39364-in-issue-board-url-doesn-t-take-in-account-hostname-settings.yml
--- a/changelogs/unreleased/40031-include-assset_sync-gem.yml
+++ b/changelogs/unreleased/40031-include-assset_sync-gem.yml
--- a/changelogs/unreleased/40573-rename-gke-as-kubernetes-engine.yml
+++ b/changelogs/unreleased/40573-rename-gke-as-kubernetes-engine.yml
--- a/changelogs/unreleased/40715-updateendpoint-undefined-on-issue-page.yml
+++ b/changelogs/unreleased/40715-updateendpoint-undefined-on-issue-page.yml
--- a/changelogs/unreleased/admin-welcome-new-group-link.yml
+++ b/changelogs/unreleased/admin-welcome-new-group-link.yml
--- a/changelogs/unreleased/anchor-issue-references.yml
+++ b/changelogs/unreleased/anchor-issue-references.yml
--- a/changelogs/unreleased/bvl-circuitbreaker-process.yml
+++ b/changelogs/unreleased/bvl-circuitbreaker-process.yml
--- a/changelogs/unreleased/commit-title-wrapping.yml
+++ b/changelogs/unreleased/commit-title-wrapping.yml
--- a/changelogs/unreleased/deploy-keys-loading-icon.yml
+++ b/changelogs/unreleased/deploy-keys-loading-icon.yml
--- a/changelogs/unreleased/docs-add-why-do-i-get-signed-out-authentication-section.yml
+++ b/changelogs/unreleased/docs-add-why-do-i-get-signed-out-authentication-section.yml
--- a/changelogs/unreleased/feature-sm-34834-missing-dependency-should-fail-job-2.yml
+++ b/changelogs/unreleased/feature-sm-34834-missing-dependency-should-fail-job-2.yml
--- a/changelogs/unreleased/fix-event-target-author-preloading.yml
+++ b/changelogs/unreleased/fix-event-target-author-preloading.yml
--- a/changelogs/unreleased/fix-new-project-guidelines-styling.yml
+++ b/changelogs/unreleased/fix-new-project-guidelines-styling.yml
--- a/changelogs/unreleased/merge-request-lock-icon-size-fix.yml
+++ b/changelogs/unreleased/merge-request-lock-icon-size-fix.yml
--- a/changelogs/unreleased/mk-fix-schema-dump-of-untracked-files-for-uploads.yml
+++ b/changelogs/unreleased/mk-fix-schema-dump-of-untracked-files-for-uploads.yml
--- a/changelogs/unreleased/outdated-browser-position-fix.yml
+++ b/changelogs/unreleased/outdated-browser-position-fix.yml
--- a/changelogs/unreleased/patch-24.yml
+++ b/changelogs/unreleased/patch-24.yml
--- a/changelogs/unreleased/sh-fix-import-rake-task.yml
+++ b/changelogs/unreleased/sh-fix-import-rake-task.yml
--- a/changelogs/unreleased/sh-remove-allocation-tracking-influxdb.yml
+++ b/changelogs/unreleased/sh-remove-allocation-tracking-influxdb.yml
--- a/changelogs/unreleased/throttle-touching-of-objects.yml
+++ b/changelogs/unreleased/throttle-touching-of-objects.yml
--- a/changelogs/unreleased/update_mr_changes_empty_page.yml
+++ b/changelogs/unreleased/update_mr_changes_empty_page.yml
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
--- a/config/initializers/active_record_schema_ignore_tables.rb
+++ b/config/initializers/active_record_schema_ignore_tables.rb
--- a/config/initializers/asset_sync.rb
+++ b/config/initializers/asset_sync.rb
--- a/config/routes.rb
+++ b/config/routes.rb
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
--- a/db/migrate/20160610194713_remove_deprecated_issues_tracker_columns_from_projects.rb
+++ b/db/migrate/20160610194713_remove_deprecated_issues_tracker_columns_from_projects.rb
--- a/db/migrate/20160610301627_remove_notification_level_from_users.rb
+++ b/db/migrate/20160610301627_remove_notification_level_from_users.rb
--- a/db/migrate/20160705055809_remove_developers_can_push_from_protected_branches.rb
+++ b/db/migrate/20160705055809_remove_developers_can_push_from_protected_branches.rb
--- a/db/migrate/20160705055813_remove_developers_can_merge_from_protected_branches.rb
+++ b/db/migrate/20160705055813_remove_developers_can_merge_from_protected_branches.rb
--- a/db/migrate/20160729173930_remove_project_id_from_spam_logs.rb
+++ b/db/migrate/20160729173930_remove_project_id_from_spam_logs.rb
--- a/db/migrate/20160831223750_remove_features_enabled_from_projects.rb
+++ b/db/migrate/20160831223750_remove_features_enabled_from_projects.rb
--- a/db/migrate/20160913162434_remove_projects_pushes_since_gc.rb
+++ b/db/migrate/20160913162434_remove_projects_pushes_since_gc.rb
--- a/db/migrate/20161018024550_remove_priority_from_labels.rb
+++ b/db/migrate/20161018024550_remove_priority_from_labels.rb
--- a/db/migrate/20161201160452_migrate_project_statistics.rb
+++ b/db/migrate/20161201160452_migrate_project_statistics.rb
--- a/db/migrate/20170222143500_remove_old_project_id_columns.rb
+++ b/db/migrate/20170222143500_remove_old_project_id_columns.rb
--- a/db/migrate/20170301205639_remove_unused_ci_tables_and_columns.rb
+++ b/db/migrate/20170301205639_remove_unused_ci_tables_and_columns.rb
--- a/db/migrate/20170315174634_revert_add_notified_of_own_activity_to_users.rb
+++ b/db/migrate/20170315174634_revert_add_notified_of_own_activity_to_users.rb
--- a/db/migrate/20171106154015_remove_issues_branch_name.rb
+++ b/db/migrate/20171106154015_remove_issues_branch_name.rb
--- a/db/migrate/20171123094802_add_circuitbreaker_check_interval_to_application_settings.rb
+++ b/db/migrate/20171123094802_add_circuitbreaker_check_interval_to_application_settings.rb
--- a/db/post_migrate/20170523073948_remove_assignee_id_from_issue.rb
+++ b/db/post_migrate/20170523073948_remove_assignee_id_from_issue.rb
--- a/db/post_migrate/20171123101020_update_circuitbreaker_defaults.rb
+++ b/db/post_migrate/20171123101020_update_circuitbreaker_defaults.rb
--- a/db/post_migrate/20171123101046_remove_old_circuitbreaker_config.rb
+++ b/db/post_migrate/20171123101046_remove_old_circuitbreaker_config.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
--- a/doc/administration/job_artifacts.md
+++ b/doc/administration/job_artifacts.md
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
--- a/doc/administration/operations/index.md
+++ b/doc/administration/operations/index.md
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
--- a/doc/ci/autodeploy/quick_start_guide.md
+++ b/doc/ci/autodeploy/quick_start_guide.md
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
--- a/doc/development/automatic_ce_ee_merge.md
+++ b/doc/development/automatic_ce_ee_merge.md
--- a/doc/development/fe_guide/style_guide_js.md
+++ b/doc/development/fe_guide/style_guide_js.md
--- a/doc/install/kubernetes/gitlab_chart.md
+++ b/doc/install/kubernetes/gitlab_chart.md
--- a/doc/install/kubernetes/gitlab_omnibus.md
+++ b/doc/install/kubernetes/gitlab_omnibus.md
--- a/doc/install/kubernetes/gitlab_runner_chart.md
+++ b/doc/install/kubernetes/gitlab_runner_chart.md
--- a/doc/install/kubernetes/index.md
+++ b/doc/install/kubernetes/index.md
--- a/doc/topics/authentication/index.md
+++ b/doc/topics/authentication/index.md
--- a/doc/topics/autodevops/img/auto_devops_settings.png
+++ b/doc/topics/autodevops/img/auto_devops_settings.png
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
--- a/doc/topics/autodevops/quick_start_guide.md
+++ b/doc/topics/autodevops/quick_start_guide.md
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
--- a/doc/user/project/pipelines/job_artifacts.md
+++ b/doc/user/project/pipelines/job_artifacts.md
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
--- a/lib/api/circuit_breakers.rb
+++ b/lib/api/circuit_breakers.rb
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
--- a/lib/banzai/filter/epic_reference_filter.rb
+++ b/lib/banzai/filter/epic_reference_filter.rb
--- a/lib/banzai/filter/table_of_contents_filter.rb
+++ b/lib/banzai/filter/table_of_contents_filter.rb
--- a/lib/banzai/filter/upload_link_filter.rb
+++ b/lib/banzai/filter/upload_link_filter.rb
--- a/lib/banzai/reference_parser/epic_parser.rb
+++ b/lib/banzai/reference_parser/epic_parser.rb
--- a/lib/gitlab/bare_repository_import/importer.rb
+++ b/lib/gitlab/bare_repository_import/importer.rb
--- a/lib/gitlab/bare_repository_import/repository.rb
+++ b/lib/gitlab/bare_repository_import/repository.rb
--- a/lib/gitlab/ci/pipeline/chain/command.rb
+++ b/lib/gitlab/ci/pipeline/chain/command.rb
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
--- a/lib/gitlab/diff/inline_diff.rb
+++ b/lib/gitlab/diff/inline_diff.rb
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
--- a/lib/gitlab/git/storage/checker.rb
+++ b/lib/gitlab/git/storage/checker.rb
--- a/lib/gitlab/git/storage/circuit_breaker.rb
+++ b/lib/gitlab/git/storage/circuit_breaker.rb
--- a/lib/gitlab/git/storage/circuit_breaker_settings.rb
+++ b/lib/gitlab/git/storage/circuit_breaker_settings.rb
--- a/lib/gitlab/git/storage/failure_info.rb
+++ b/lib/gitlab/git/storage/failure_info.rb
--- a/lib/gitlab/git/storage/null_circuit_breaker.rb
+++ b/lib/gitlab/git/storage/null_circuit_breaker.rb
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
--- a/lib/gitlab/gitaly_client/wiki_service.rb
+++ b/lib/gitlab/gitaly_client/wiki_service.rb
--- a/lib/gitlab/metrics/samplers/influx_sampler.rb
+++ b/lib/gitlab/metrics/samplers/influx_sampler.rb
--- a/lib/gitlab/metrics/samplers/ruby_sampler.rb
+++ b/lib/gitlab/metrics/samplers/ruby_sampler.rb
--- a/lib/gitlab/storage_check.rb
+++ b/lib/gitlab/storage_check.rb
--- a/lib/gitlab/storage_check/cli.rb
+++ b/lib/gitlab/storage_check/cli.rb
--- a/lib/gitlab/storage_check/gitlab_caller.rb
+++ b/lib/gitlab/storage_check/gitlab_caller.rb
--- a/lib/gitlab/storage_check/option_parser.rb
+++ b/lib/gitlab/storage_check/option_parser.rb
--- a/lib/gitlab/storage_check/response.rb
+++ b/lib/gitlab/storage_check/response.rb
--- a/lib/gitlab/utils.rb
+++ b/lib/gitlab/utils.rb
--- a/locale/bg/gitlab.po
+++ b/locale/bg/gitlab.po
--- a/locale/de/gitlab.po
+++ b/locale/de/gitlab.po
--- a/locale/eo/gitlab.po
+++ b/locale/eo/gitlab.po
--- a/locale/es/gitlab.po
+++ b/locale/es/gitlab.po
--- a/locale/fr/gitlab.po
+++ b/locale/fr/gitlab.po
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
--- a/locale/it/gitlab.po
+++ b/locale/it/gitlab.po
--- a/locale/ja/gitlab.po
+++ b/locale/ja/gitlab.po
--- a/locale/ko/gitlab.po
+++ b/locale/ko/gitlab.po
--- a/locale/nl_NL/gitlab.po
+++ b/locale/nl_NL/gitlab.po
--- a/locale/pl_PL/gitlab.po
+++ b/locale/pl_PL/gitlab.po
--- a/locale/pt_BR/gitlab.po
+++ b/locale/pt_BR/gitlab.po
--- a/locale/ru/gitlab.po
+++ b/locale/ru/gitlab.po
--- a/locale/uk/gitlab.po
+++ b/locale/uk/gitlab.po
--- a/locale/zh_CN/gitlab.po
+++ b/locale/zh_CN/gitlab.po
--- a/locale/zh_HK/gitlab.po
+++ b/locale/zh_HK/gitlab.po
--- a/locale/zh_TW/gitlab.po
+++ b/locale/zh_TW/gitlab.po
--- a/qa/qa.rb
+++ b/qa/qa.rb
--- a/qa/qa/page/group/new.rb
+++ b/qa/qa/page/group/new.rb
--- a/qa/qa/scenario/gitlab/repository/push.rb
+++ b/qa/qa/scenario/gitlab/repository/push.rb
--- a/qa/qa/specs/features/repository/push_spec.rb
+++ b/qa/qa/specs/features/repository/push_spec.rb
--- a/rubocop/cop/migration/remove_column.rb
+++ b/rubocop/cop/migration/remove_column.rb
--- a/rubocop/migration_helpers.rb
+++ b/rubocop/migration_helpers.rb
--- a/rubocop/rubocop.rb
+++ b/rubocop/rubocop.rb
--- a/scripts/trigger-build-omnibus
+++ b/scripts/trigger-build-omnibus
--- a/spec/bin/storage_check_spec.rb
+++ b/spec/bin/storage_check_spec.rb
--- a/spec/controllers/admin/health_check_controller_spec.rb
+++ b/spec/controllers/admin/health_check_controller_spec.rb
--- a/spec/controllers/groups/group_members_controller_spec.rb
+++ b/spec/controllers/groups/group_members_controller_spec.rb
--- a/spec/controllers/health_controller_spec.rb
+++ b/spec/controllers/health_controller_spec.rb
--- a/spec/controllers/projects/boards_controller_spec.rb
+++ b/spec/controllers/projects/boards_controller_spec.rb
--- a/spec/controllers/projects/pipelines_settings_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_settings_controller_spec.rb
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
--- a/spec/features/admin/admin_health_check_spec.rb
+++ b/spec/features/admin/admin_health_check_spec.rb
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
--- a/spec/features/merge_requests/image_diff_notes.rb
+++ b/spec/features/merge_requests/image_diff_notes.rb
--- a/spec/features/merge_requests/widget_spec.rb
+++ b/spec/features/merge_requests/widget_spec.rb
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
--- a/spec/helpers/auto_devops_helper_spec.rb
+++ b/spec/helpers/auto_devops_helper_spec.rb
--- a/spec/helpers/boards_helper_spec.rb
+++ b/spec/helpers/boards_helper_spec.rb
--- a/spec/helpers/merge_requests_helper_spec.rb
+++ b/spec/helpers/merge_requests_helper_spec.rb
--- a/spec/javascripts/boards/boards_store_spec.js
+++ b/spec/javascripts/boards/boards_store_spec.js
--- a/spec/javascripts/deploy_keys/components/action_btn_spec.js
+++ b/spec/javascripts/deploy_keys/components/action_btn_spec.js
--- a/spec/javascripts/deploy_keys/components/app_spec.js
+++ b/spec/javascripts/deploy_keys/components/app_spec.js
--- a/spec/javascripts/lib/utils/datefix_spec.js
+++ b/spec/javascripts/lib/utils/datefix_spec.js
--- a/spec/javascripts/monitoring/graph/deployment_spec.js
+++ b/spec/javascripts/monitoring/graph/deployment_spec.js
--- a/spec/javascripts/monitoring/graph_spec.js
+++ b/spec/javascripts/monitoring/graph_spec.js
--- a/spec/javascripts/monitoring/mock_data.js
+++ b/spec/javascripts/monitoring/mock_data.js
--- a/spec/javascripts/notes/components/issue_comment_form_spec.js
+++ b/spec/javascripts/notes/components/issue_comment_form_spec.js
--- a/spec/javascripts/notes/components/issue_note_app_spec.js
+++ b/spec/javascripts/notes/components/issue_note_app_spec.js
--- a/spec/javascripts/notes/components/issue_note_body_spec.js
+++ b/spec/javascripts/notes/components/issue_note_body_spec.js
--- a/spec/javascripts/notes/components/issue_note_form_spec.js
+++ b/spec/javascripts/notes/components/issue_note_form_spec.js
--- a/spec/javascripts/notes/components/issue_discussion_spec.js
+++ b/spec/javascripts/notes/components/issue_discussion_spec.js
--- a/spec/javascripts/notes/components/issue_note_spec.js
+++ b/spec/javascripts/notes/components/issue_note_spec.js
--- a/spec/javascripts/search_autocomplete_spec.js
+++ b/spec/javascripts/search_autocomplete_spec.js
--- a/spec/lib/banzai/filter/table_of_contents_filter_spec.rb
+++ b/spec/lib/banzai/filter/table_of_contents_filter_spec.rb
--- a/spec/lib/banzai/filter/upload_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/upload_link_filter_spec.rb
--- a/spec/lib/gitlab/bare_repository_import/importer_spec.rb
+++ b/spec/lib/gitlab/bare_repository_import/importer_spec.rb
--- a/spec/lib/gitlab/bare_repository_import/repository_spec.rb
+++ b/spec/lib/gitlab/bare_repository_import/repository_spec.rb
--- a/spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/validate/abilities_spec.rb
--- a/spec/lib/gitlab/diff/inline_diff_spec.rb
+++ b/spec/lib/gitlab/diff/inline_diff_spec.rb
--- a/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
+++ b/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
--- a/spec/lib/gitlab/git/storage/checker_spec.rb
+++ b/spec/lib/gitlab/git/storage/checker_spec.rb
--- a/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
+++ b/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
--- a/spec/lib/gitlab/git/storage/failure_info_spec.rb
+++ b/spec/lib/gitlab/git/storage/failure_info_spec.rb
--- a/spec/lib/gitlab/git/storage/health_spec.rb
+++ b/spec/lib/gitlab/git/storage/health_spec.rb
--- a/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb
+++ b/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb
--- a/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/influx_sampler_spec.rb
--- a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
--- a/spec/lib/gitlab/storage_check/cli_spec.rb
+++ b/spec/lib/gitlab/storage_check/cli_spec.rb
--- a/spec/lib/gitlab/storage_check/gitlab_caller_spec.rb
+++ b/spec/lib/gitlab/storage_check/gitlab_caller_spec.rb
--- a/spec/lib/gitlab/storage_check/option_parser_spec.rb
+++ b/spec/lib/gitlab/storage_check/option_parser_spec.rb
--- a/spec/lib/gitlab/storage_check/response_spec.rb
+++ b/spec/lib/gitlab/storage_check/response_spec.rb
--- a/spec/migrations/remove_assignee_id_from_issue_spec.rb
+++ b/spec/migrations/remove_assignee_id_from_issue_spec.rb
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
--- a/spec/models/personal_access_token_spec.rb
+++ b/spec/models/personal_access_token_spec.rb
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
--- a/spec/requests/api/circuit_breakers_spec.rb
+++ b/spec/requests/api/circuit_breakers_spec.rb
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
--- a/spec/rubocop/cop/migration/remove_column_spec.rb
+++ b/spec/rubocop/cop/migration/remove_column_spec.rb
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
--- a/spec/services/members/authorized_destroy_service_spec.rb
+++ b/spec/services/members/authorized_destroy_service_spec.rb
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
--- a/spec/services/users/keys_count_service_spec.rb
+++ b/spec/services/users/keys_count_service_spec.rb
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
--- a/spec/support/google_api/cloud_platform_helpers.rb
+++ b/spec/support/google_api/cloud_platform_helpers.rb
--- a/spec/support/shared_examples/throttled_touch.rb
+++ b/spec/support/shared_examples/throttled_touch.rb
--- a/spec/support/stored_repositories.rb
+++ b/spec/support/stored_repositories.rb
--- a/spec/support/stub_configuration.rb
+++ b/spec/support/stub_configuration.rb
--- a/spec/views/dashboard/projects/_blank_state_admin_welcome.haml.rb
+++ b/spec/views/dashboard/projects/_blank_state_admin_welcome.haml.rb
--- a/yarn.lock
+++ b/yarn.lock