Merge branch 'master' into 48237-toggle-file-comments

* master: (38 commits) Update bitbucket.md to fix typo and small grammar touchups. Update time_helper.rb to fix output for exact minutes. Document update for GitLab Pages users. Support manually stopping any environment from the UI Fix link to frontend in handbook Shorten CHANGELOG filename to avoid breaking ecryptfs users Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml Fix mountComponent helper path in docs Fix #48537 - Update avatar only via the projects API Add additional headline for Adding SSH keys to GitLab Request to be a proofreader. Fix specs Fix search bar text input alignment Fix API docs on unauthenticated projects return Adds with_projects optional parameter to /groups/:id API endpoint Docs: make it clear that you need a completely separate domain for Pages Document that we don't want to wait in tests Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor Remove useless return Use latest gitlab-styles ...

Merge branch 'master' into 48237-toggle-file-comments
* master: (38 commits) Update bitbucket.md to fix typo and small grammar touchups. Update time_helper.rb to fix output for exact minutes. Document update for GitLab Pages users. Support manually stopping any environment from the UI Fix link to frontend in handbook Shorten CHANGELOG filename to avoid breaking ecryptfs users Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml Fix mountComponent helper path in docs Fix #48537 - Update avatar only via the projects API Add additional headline for Adding SSH keys to GitLab Request to be a proofreader. Fix specs Fix search bar text input alignment Fix API docs on unauthenticated projects return Adds with_projects optional parameter to /groups/:id API endpoint Docs: make it clear that you need a completely separate domain for Pages Document that we don't want to wait in tests Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor Remove useless return Use latest gitlab-styles ...
135ead1d · Filipa Lacerda · ac71675d · f3edbafe · 135ead1d · 135ead1d
Commit 135ead1d authored Jul 10, 2018 by Filipa Lacerda
319 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -327,7 +327,7 @@ cloud-native-image:
  cache: {}
  script:
    - gem install gitlab --no-ri --no-rdoc
-    - ./trigger-build cng
+    - ./scripts/trigger-build cng
  only:
    - tags@gitlab-org/gitlab-ce
    - tags@gitlab-org/gitlab-ee

--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -199,12 +199,6 @@ Naming/HeredocDelimiterCase:
 Naming/HeredocDelimiterNaming:
  Enabled: false
-# Offense count: 27
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Performance/HashEachMethods:
-  Enabled: false
 # Offense count: 1
 Performance/UnfreezeString:
  Exclude:

--- a/Gemfile
+++ b/Gemfile
@@ -104,7 +104,7 @@ gem 'hashie-forbidden_attributes'
 gem 'kaminari', '~> 1.0'
 # HAML
-gem 'hamlit', '~> 2.6.1'
+gem 'hamlit', '~> 2.8.8'
 # Files attachments
 gem 'carrierwave', '~> 1.2'
@@ -351,9 +351,9 @@ group :development, :test do
  gem 'spring', '~> 2.0.0'
  gem 'spring-commands-rspec', '~> 1.0.4'
-  gem 'gitlab-styles', '~> 2.3', require: false
+  gem 'gitlab-styles', '~> 2.4', require: false
  # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '~> 0.52.1'
+  gem 'rubocop', '~> 0.54.0'
  gem 'rubocop-rspec', '~> 1.22.1'
  gem 'scss_lint', '~> 0.56.0', require: false

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -312,8 +312,8 @@ GEM
      mime-types (>= 1.16)
      posix-spawn (~> 0.3)
    gitlab-markup (1.6.4)
-    gitlab-styles (2.3.2)
+    gitlab-styles (2.4.1)
-      rubocop (~> 0.51)
+      rubocop (~> 0.54.0)
      rubocop-gitlab-security (~> 0.1.0)
      rubocop-rspec (~> 1.19)
    gitlab_omniauth-ldap (2.0.4)
@@ -381,8 +381,8 @@ GEM
      rake (>= 10, < 13)
      rubocop (>= 0.49.0)
      sysexits (~> 1.1)
-    hamlit (2.6.1)
+    hamlit (2.8.8)
-      temple (~> 0.7.6)
+      temple (>= 0.8.0)
      thor
      tilt
    hashdiff (0.3.4)
@@ -776,16 +776,16 @@ GEM
      pg
      rails
      sqlite3
-    rubocop (0.52.1)
+    rubocop (0.54.0)
      parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
      powerpack (~> 0.1)
      rainbow (>= 2.2.2, < 4.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (~> 1.0, >= 1.0.1)
    rubocop-gitlab-security (0.1.1)
      rubocop (>= 0.51)
-    rubocop-rspec (1.22.1)
+    rubocop-rspec (1.22.2)
      rubocop (>= 0.52.1)
    ruby-enum (0.7.2)
      i18n
@@ -889,7 +889,7 @@ GEM
    sys-filesystem (1.1.6)
      ffi
    sysexits (1.2.0)
-    temple (0.7.7)
+    temple (0.8.0)
    test-prof (0.2.5)
    test_after_commit (1.1.0)
      activerecord (>= 3.2)
@@ -900,7 +900,7 @@ GEM
      rack (>= 1, < 3)
    thor (0.19.4)
    thread_safe (0.3.6)
-    tilt (2.0.6)
+    tilt (2.0.8)
    timecop (0.8.1)
    timfel-krb5-auth (0.8.3)
    toml (0.1.2)
@@ -1043,7 +1043,7 @@ DEPENDENCIES
  gitlab-gollum-lib (~> 4.2)
  gitlab-gollum-rugged_adapter (~> 0.4.4)
  gitlab-markup (~> 1.6.4)
-  gitlab-styles (~> 2.3)
+  gitlab-styles (~> 2.4)
  gitlab_omniauth-ldap (~> 2.0.4)
  gon (~> 6.2)
  google-api-client (~> 0.19.8)
@@ -1057,7 +1057,7 @@ DEPENDENCIES
  graphql (~> 1.8.0)
  grpc (~> 1.11.0)
  haml_lint (~> 0.26.0)
-  hamlit (~> 2.6.1)
+  hamlit (~> 2.8.8)
  hashie-forbidden_attributes
  health_check (~> 2.6.0)
  hipchat (~> 1.5.0)
@@ -1143,7 +1143,7 @@ DEPENDENCIES
  rspec-retry (~> 0.4.5)
  rspec-set (~> 0.1.3)
  rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.52.1)
+  rubocop (~> 0.54.0)
  rubocop-rspec (~> 1.22.1)
  ruby-fogbugz (~> 0.2.1)
  ruby-prof (~> 0.17.0)

--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -79,7 +79,7 @@ GEM
    babosa (1.0.2)
    base32 (0.3.2)
    batch-loader (1.2.1)
-    bcrypt (3.1.11)
+    bcrypt (3.1.12)
    bcrypt_pbkdf (1.0.0)
    benchmark-ips (2.3.0)
    better_errors (2.1.1)
@@ -111,7 +111,7 @@ GEM
    capybara-screenshot (1.0.14)
      capybara (>= 1.0, < 3)
      launchy
-    carrierwave (1.2.1)
+    carrierwave (1.2.3)
      activemodel (>= 4.0.0)
      activesupport (>= 4.0.0)
      mime-types (>= 1.16)
@@ -315,8 +315,8 @@ GEM
      mime-types (>= 1.16)
      posix-spawn (~> 0.3)
    gitlab-markup (1.6.4)
-    gitlab-styles (2.3.2)
+    gitlab-styles (2.4.1)
-      rubocop (~> 0.51)
+      rubocop (~> 0.54.0)
      rubocop-gitlab-security (~> 0.1.0)
      rubocop-rspec (~> 1.19)
    gitlab_omniauth-ldap (2.0.4)
@@ -384,8 +384,8 @@ GEM
      rake (>= 10, < 13)
      rubocop (>= 0.49.0)
      sysexits (~> 1.1)
-    hamlit (2.6.1)
+    hamlit (2.8.8)
-      temple (~> 0.7.6)
+      temple (>= 0.8.0)
      thor
      tilt
    hashdiff (0.3.4)
@@ -514,7 +514,7 @@ GEM
    net-ssh (5.0.1)
    netrc (0.11.0)
    nio4r (2.3.1)
-    nokogiri (1.8.2)
+    nokogiri (1.8.3)
      mini_portile2 (~> 2.3.0)
    nokogumbo (1.5.0)
      nokogiri
@@ -785,16 +785,16 @@ GEM
      pg
      rails
      sqlite3
-    rubocop (0.52.1)
+    rubocop (0.54.0)
      parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
      powerpack (~> 0.1)
      rainbow (>= 2.2.2, < 4.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (~> 1.0, >= 1.0.1)
    rubocop-gitlab-security (0.1.1)
      rubocop (>= 0.51)
-    rubocop-rspec (1.22.1)
+    rubocop-rspec (1.22.2)
      rubocop (>= 0.52.1)
    ruby-enum (0.7.2)
      i18n
@@ -811,7 +811,7 @@ GEM
    rubyzip (1.2.1)
    rufus-scheduler (3.4.0)
      et-orbi (~> 1.0)
-    rugged (0.27.1)
+    rugged (0.27.2)
    safe_yaml (1.0.4)
    sanitize (4.6.5)
      crass (~> 1.0.2)
@@ -877,7 +877,7 @@ GEM
      activesupport (>= 4.2)
    spring-commands-rspec (1.0.4)
      spring (>= 0.9.1)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
    sprockets-rails (3.2.1)
@@ -898,7 +898,7 @@ GEM
    sys-filesystem (1.1.6)
      ffi
    sysexits (1.2.0)
-    temple (0.7.7)
+    temple (0.8.0)
    test-prof (0.2.5)
    text (1.3.1)
    thin (1.7.0)
@@ -1053,7 +1053,7 @@ DEPENDENCIES
  gitlab-gollum-lib (~> 4.2)
  gitlab-gollum-rugged_adapter (~> 0.4.4)
  gitlab-markup (~> 1.6.4)
-  gitlab-styles (~> 2.3)
+  gitlab-styles (~> 2.4)
  gitlab_omniauth-ldap (~> 2.0.4)
  gon (~> 6.2)
  google-api-client (~> 0.19.8)
@@ -1067,7 +1067,7 @@ DEPENDENCIES
  graphql (~> 1.8.0)
  grpc (~> 1.11.0)
  haml_lint (~> 0.26.0)
-  hamlit (~> 2.6.1)
+  hamlit (~> 2.8.8)
  hashie-forbidden_attributes
  health_check (~> 2.6.0)
  hipchat (~> 1.5.0)
@@ -1154,7 +1154,7 @@ DEPENDENCIES
  rspec-retry (~> 0.4.5)
  rspec-set (~> 0.1.3)
  rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.52.1)
+  rubocop (~> 0.54.0)
  rubocop-rspec (~> 1.22.1)
  ruby-fogbugz (~> 0.2.1)
  ruby-prof (~> 0.17.0)

--- a/README.md
+++ b/README.md
 # GitLab
-[![Build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
-[![Overall test coverage](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-ce/pipelines)
-[![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
-[![Core Infrastructure Initiative Best Practices](https://bestpractices.coreinfrastructure.org/projects/42/badge)](https://bestpractices.coreinfrastructure.org/projects/42)
-[![Gitter](https://badges.gitter.im/gitlabhq/gitlabhq.svg)](https://gitter.im/gitlabhq/gitlabhq?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 ## Test coverage
 - [![Ruby coverage](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg?job=coverage)](https://gitlab-org.gitlab.io/gitlab-ce/coverage-ruby) Ruby

--- a/Rakefile
+++ b/Rakefile
@@ -2,9 +2,9 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
-relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
+relative_url_conf = File.expand_path('config/initializers/relative_url', __dir__)
 require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
 Gitlab::Application.load_tasks

--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -39,11 +39,6 @@ export default {
      required: false,
      default: true,
    },
-    discussionsExpanded: {
-      type: Boolean,
-      required: false,
-      default: true,
-    },
    currentUser: {
      type: Object,
      required: true,
@@ -116,7 +111,7 @@ export default {
  },
  methods: {
    ...mapActions('diffs', ['toggleFileDiscussions']),
-    handleToggle(e, checkTarget) {
+    handleToggleFile(e, checkTarget) {
      if (
        !checkTarget ||
        e.target === this.$refs.header ||
@@ -128,7 +123,7 @@ export default {
    showForkMessage() {
      this.$emit('showForkMessage');
    },
-    handleToggleDiscussions(){
+    handleToggleDiscussions() {
      this.toggleFileDiscussions(this.diffFile);
    },
  },
@@ -139,7 +134,7 @@ export default {
  <div
    ref="header"
    class="js-file-title file-title file-title-flex-parent"
-    @click="handleToggle($event, true)"
+    @click="handleToggleFile($event, true)"
  >
    <div class="file-header-content">
      <icon
@@ -224,9 +219,9 @@ export default {
        <button
          :class="{ active: hasExpandedDiscussions }"
          :title="s__('MergeRequests|Toggle comments for this file')"
-          @click="handleToggleDiscussions"
+          class="js-btn-vue-toggle-comments btn"
-          class="btn"
          type="button"
+          @click="handleToggleDiscussions"
        >
          <icon name="comment" />
        </button>

--- a/app/assets/javascripts/diffs/store/actions.js
+++ b/app/assets/javascripts/diffs/store/actions.js
@@ -112,15 +112,5 @@ export const toggleFileDiscussions = ({ getters, dispatch }, diff) => {
  });
 };
-export default {
+// prevent babel-plugin-rewire from generating an invalid default during karma tests
-  setBaseConfig,
+export default () => {};
-  fetchDiffFiles,
-  setInlineDiffViewType,
-  setParallelDiffViewType,
-  showCommentForm,
-  cancelCommentForm,
-  loadMoreLines,
-  loadCollapsedDiff,
-  expandAllFiles,
-  toggleFileDiscussions,
-};
--- a/app/assets/javascripts/diffs/store/getters.js
+++ b/app/assets/javascripts/diffs/store/getters.js
@@ -31,6 +31,20 @@ export const diffHasAllCollpasedDiscussions = (state, getters) => diff => {
  return (discussions.length && discussions.every(discussion => !discussion.expanded)) || false;
 };
+/**
+ * Checks if the diff has any open discussions
+ * @param {Object} diff
+ * @returns {Boolean}
+ */
+export const diffHasExpandedDiscussions = (state, getters) => diff => {
+  const discussions = getters.getDiffFileDiscussions(diff);
+  return (
+    (discussions.length && discussions.find(discussion => discussion.expanded) !== undefined) ||
+    false
+  );
+};
 /**
 * Returns an array with the discussions of the given diff
 * @param {Object} diff

--- a/app/assets/javascripts/diffs/store/index.js
+++ b/app/assets/javascripts/diffs/store/index.js
-import Vue from 'vue';
-import Vuex from 'vuex';
-import diffsModule from './modules';
-Vue.use(Vuex);
-export default new Vuex.Store({
-  modules: {
-    diffs: diffsModule,
-  },
-});
--- a/app/assets/javascripts/diffs/store/modules/index.js
+++ b/app/assets/javascripts/diffs/store/modules/index.js
-import actions from '../actions';
+import * as actions from '../actions';
 import * as getters from '../getters';
 import mutations from '../mutations';
 import createState from './diff_state';

--- a/app/assets/javascripts/due_date_select.js
+++ b/app/assets/javascripts/due_date_select.js
@@ -171,6 +171,8 @@ export default class DueDateSelectors {
  initMilestoneDatePicker() {
    $('.datepicker').each(function initPikadayMilestone() {
      const $datePicker = $(this);
+      const datePickerVal = $datePicker.val();
      const calendar = new Pikaday({
        field: $datePicker.get(0),
        theme: 'gitlab-theme animate-picker',
@@ -183,7 +185,7 @@ export default class DueDateSelectors {
        },
      });
-      calendar.setDate(parsePikadayDate($datePicker.val()));
+      calendar.setDate(parsePikadayDate(datePickerVal));
      $datePicker.data('pikaday', calendar);
    });

--- a/app/assets/javascripts/environments/components/environment_actions.vue
+++ b/app/assets/javascripts/environments/components/environment_actions.vue
 <script>
-  import Icon from '~/vue_shared/components/icon.vue';
+import Icon from '~/vue_shared/components/icon.vue';
-  import eventHub from '../event_hub';
+import eventHub from '../event_hub';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+import loadingIcon from '../../vue_shared/components/loading_icon.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
+import tooltip from '../../vue_shared/directives/tooltip';
-  export default {
+export default {
  directives: {
    tooltip,
  },
@@ -33,7 +33,7 @@
    onClickAction(endpoint) {
      this.isLoading = true;
-        eventHub.$emit('postAction', endpoint);
+      eventHub.$emit('postAction', { endpoint });
    },
    isActionDisabled(action) {
@@ -44,7 +44,7 @@
      return !action.playable;
    },
  },
-  };
+};
 </script>
 <template>
  <div
@@ -61,10 +61,7 @@
      data-toggle="dropdown"
    >
      <span>
-        <icon
+        <icon name="play" />
-          :size="12"
-          name="play"
-        />
        <i
          class="fa fa-caret-down"
          aria-hidden="true"
@@ -85,10 +82,6 @@
          class="js-manual-action-link no-btn btn"
          @click="onClickAction(action.play_path)"
        >
-          <icon
-            :size="12"
-            name="play"
-          />
          <span>
            {{ action.name }}
          </span>

--- a/app/assets/javascripts/environments/components/environment_external_url.vue
+++ b/app/assets/javascripts/environments/components/environment_external_url.vue
 <script>
-  import Icon from '~/vue_shared/components/icon.vue';
+import Icon from '~/vue_shared/components/icon.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
+import tooltip from '../../vue_shared/directives/tooltip';
-  import { s__ } from '../../locale';
+import { s__ } from '../../locale';
-  /**
+/**
 * Renders the external url link in environments table.
 */
-  export default {
+export default {
  components: {
    Icon,
  },
@@ -21,10 +21,10 @@
  },
  computed: {
    title() {
-        return s__('Environments|Open');
+      return s__('Environments|Open live environment');
    },
  },
-  };
+};
 </script>
 <template>
  <a
@@ -37,9 +37,6 @@
    target="_blank"
    rel="noopener noreferrer nofollow"
  >
-    <icon
+    <icon name="external-link" />
-      :size="12"
-      name="external-link"
-    />
  </a>
 </template>
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
--- a/app/assets/javascripts/environments/components/environment_monitoring.vue
+++ b/app/assets/javascripts/environments/components/environment_monitoring.vue
 <script>
-  /**
+/**
 * Renders the Monitoring (Metrics) link in environments table.
 */
-  import Icon from '~/vue_shared/components/icon.vue';
+import Icon from '~/vue_shared/components/icon.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
+import tooltip from '../../vue_shared/directives/tooltip';
-  export default {
+export default {
  components: {
    Icon,
  },
@@ -23,7 +23,7 @@
      return 'Monitoring';
    },
  },
-  };
+};
 </script>
 <template>
  <a
@@ -35,9 +35,6 @@
    data-container="body"
    rel="noopener noreferrer nofollow"
  >
-    <icon
+    <icon name="chart" />
-      :size="12"
-      name="chart"
-    />
  </a>
 </template>
--- a/app/assets/javascripts/environments/components/environment_rollback.vue
+++ b/app/assets/javascripts/environments/components/environment_rollback.vue
 <script>
-  /**
+/**
 * Renders Rollback or Re deploy button in environments table depending
 * of the provided property `isLastDeployment`.
 *
 * Makes a post request when the button is clicked.
 */
-  import eventHub from '../event_hub';
+import { s__ } from '~/locale';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+import Icon from '~/vue_shared/components/icon.vue';
+import tooltip from '~/vue_shared/directives/tooltip';
+import eventHub from '../event_hub';
+import LoadingIcon from '../../vue_shared/components/loading_icon.vue';
-  export default {
+export default {
  components: {
-      loadingIcon,
+    Icon,
+    LoadingIcon,
  },
+  directives: {
+    tooltip,
+  },
  props: {
    retryUrl: {
      type: String,
@@ -28,29 +37,38 @@
      isLoading: false,
    };
  },
+  computed: {
+    title() {
+      return this.isLastDeployment ? s__('Environments|Re-deploy to environment') : s__('Environments|Rollback environment');
+    },
+  },
  methods: {
    onClick() {
      this.isLoading = true;
-        eventHub.$emit('postAction', this.retryUrl);
+      eventHub.$emit('postAction', { endpoint: this.retryUrl });
    },
  },
-  };
+};
 </script>
 <template>
  <button
+    v-tooltip
    :disabled="isLoading"
+    :title="title"
    type="button"
    class="btn d-none d-sm-none d-md-block"
    @click="onClick"
  >
-    <span v-if="isLastDeployment">
+    <icon
-      {{ s__("Environments|Re-deploy") }}
+      v-if="isLastDeployment"
-    </span>
+      name="repeat" />
-    <span v-else>
+    <icon
-      {{ s__("Environments|Rollback") }}
+      v-else
-    </span>
+      name="redo"/>
    <loading-icon v-if="isLoading" />
  </button>

--- a/app/assets/javascripts/environments/components/environment_stop.vue
+++ b/app/assets/javascripts/environments/components/environment_stop.vue
 <script>
-  /**
+/**
 * Renders the stop "button" that allows stop an environment.
 * Used in environments table.
 */
-  import $ from 'jquery';
+import $ from 'jquery';
-  import eventHub from '../event_hub';
+import Icon from '~/vue_shared/components/icon.vue';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
+import { s__ } from '~/locale';
-  import tooltip from '../../vue_shared/directives/tooltip';
+import eventHub from '../event_hub';
+import LoadingButton from '../../vue_shared/components/loading_button.vue';
+import tooltip from '../../vue_shared/directives/tooltip';
-  export default {
+export default {
  components: {
-      loadingIcon,
+    Icon,
+    LoadingButton,
  },
  directives: {
@@ -19,9 +22,9 @@
  },
  props: {
-      stopUrl: {
+    environment: {
-        type: String,
+      type: Object,
-        default: '',
+      required: true,
    },
  },
@@ -33,40 +36,43 @@
  computed: {
    title() {
-        return 'Stop';
+      return s__('Environments|Stop environment');
    },
  },
+  mounted() {
+    eventHub.$on('stopEnvironment', this.onStopEnvironment);
+  },
+  beforeDestroy() {
+    eventHub.$off('stopEnvironment', this.onStopEnvironment);
+  },
  methods: {
    onClick() {
-        // eslint-disable-next-line no-alert
-        if (window.confirm('Are you sure you want to stop this environment?')) {
-          this.isLoading = true;
      $(this.$el).tooltip('dispose');
+      eventHub.$emit('requestStopEnvironment', this.environment);
-          eventHub.$emit('postAction', this.stopUrl);
+    },
+    onStopEnvironment(environment) {
+      if (this.environment.id === environment.id) {
+        this.isLoading = true;
      }
    },
  },
-  };
+};
 </script>
 <template>
-  <button
+  <loading-button
    v-tooltip
-    :disabled="isLoading"
+    :loading="isLoading"
    :title="title"
    :aria-label="title"
-    type="button"
+    container-class="btn btn-danger d-none d-sm-none d-md-block"
-    class="btn stop-env-link d-none d-sm-none d-md-block"
    data-container="body"
+    data-toggle="modal"
+    data-target="#stop-environment-modal"
    @click="onClick"
  >
-    <i
+    <icon name="stop"/>
-      class="fa fa-stop stop-env-icon"
+  </loading-button>
-      aria-hidden="true"
-    >
-    </i>
-    <loading-icon v-if="isLoading" />
-  </button>
 </template>
--- a/app/assets/javascripts/environments/components/environment_terminal_button.vue
+++ b/app/assets/javascripts/environments/components/environment_terminal_button.vue
 <script>
-  /**
+/**
 * Renders a terminal button to open a web terminal.
 * Used in environments table.
 */
-  import Icon from '~/vue_shared/components/icon.vue';
+import Icon from '~/vue_shared/components/icon.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
+import tooltip from '../../vue_shared/directives/tooltip';
-  export default {
+export default {
  components: {
    Icon,
  },
@@ -25,7 +25,7 @@
      return 'Terminal';
    },
  },
-  };
+};
 </script>
 <template>
  <a
@@ -36,9 +36,6 @@
    class="btn terminal-button d-none d-sm-none d-md-block"
    data-container="body"
  >
-    <icon
+    <icon name="terminal" />
-      :size="12"
-      name="terminal"
-    />
  </a>
 </template>
--- a/app/assets/javascripts/environments/components/environments_app.vue
+++ b/app/assets/javascripts/environments/components/environments_app.vue
@@ -5,10 +5,12 @@
  import eventHub from '../event_hub';
  import environmentsMixin from '../mixins/environments_mixin';
  import CIPaginationMixin from '../../vue_shared/mixins/ci_pagination_api_mixin';
+  import StopEnvironmentModal from './stop_environment_modal.vue';
  export default {
    components: {
      emptyState,
+      StopEnvironmentModal,
    },
    mixins: [
@@ -90,6 +92,8 @@
 </script>
 <template>
  <div :class="cssContainerClass">
+    <stop-environment-modal :environment="environmentInStopModal" />
    <div class="top-area">
      <tabs
        :tabs="tabs"

--- a/app/assets/javascripts/environments/components/stop_environment_modal.vue
+++ b/app/assets/javascripts/environments/components/stop_environment_modal.vue
+<script>
+import GlModal from '~/vue_shared/components/gl_modal.vue';
+import { s__, sprintf } from '~/locale';
+import tooltip from '~/vue_shared/directives/tooltip';
+import LoadingButton from '~/vue_shared/components/loading_button.vue';
+import eventHub from '../event_hub';
+export default {
+  id: 'stop-environment-modal',
+  name: 'StopEnvironmentModal',
+  components: {
+    GlModal,
+    LoadingButton,
+  },
+  directives: {
+    tooltip,
+  },
+  props: {
+    environment: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    noStopActionMessage() {
+      return sprintf(
+        s__(
+          `Environments|Note that this action will stop the environment,
+        but it will %{emphasisStart}not%{emphasisEnd} have an effect on any existing deployment
+        due to no “stop environment action” being defined
+        in the %{ciConfigLinkStart}.gitlab-ci.yml%{ciConfigLinkEnd} file.`,
+        ),
+        {
+          emphasisStart: '<strong>',
+          emphasisEnd: '</strong>',
+          ciConfigLinkStart:
+            '<a href="https://docs.gitlab.com/ee/ci/yaml/" target="_blank" rel="noopener noreferrer">',
+          ciConfigLinkEnd: '</a>',
+        },
+        false,
+      );
+    },
+  },
+  methods: {
+    onSubmit() {
+      eventHub.$emit('stopEnvironment', this.environment);
+    },
+  },
+};
+</script>
+<template>
+  <gl-modal
+    :id="$options.id"
+    :footer-primary-button-text="s__('Environments|Stop environment')"
+    footer-primary-button-variant="danger"
+    @submit="onSubmit"
+  >
+    <template slot="header">
+      <h4
+        class="modal-title d-flex mw-100"
+      >
+        Stopping
+        <span
+          v-tooltip
+          :title="environment.name"
+          class="text-truncate ml-1 mr-1 flex-fill"
+        >{{ environment.name }}</span>
+        ?
+      </h4>
+    </template>
+    <p>{{ s__('Environments|Are you sure you want to stop this environment?') }}</p>
+    <div
+      v-if="!environment.has_stop_action"
+      class="warning_message"
+    >
+      <p v-html="noStopActionMessage"></p>
+      <a
+        href="https://docs.gitlab.com/ee/ci/environments.html#stopping-an-environment"
+        target="_blank"
+        rel="noopener noreferrer"
+      >{{ s__('Environments|Learn more about stopping environments') }}</a>
+    </div>
+  </gl-modal>
+</template>
--- a/app/assets/javascripts/environments/folder/environments_folder_view.vue
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.vue
 <script>
  import environmentsMixin from '../mixins/environments_mixin';
  import CIPaginationMixin from '../../vue_shared/mixins/ci_pagination_api_mixin';
+  import StopEnvironmentModal from '../components/stop_environment_modal.vue';
  export default {
+    components: {
+      StopEnvironmentModal,
+    },
    mixins: [
      environmentsMixin,
      CIPaginationMixin,
    ],
    props: {
      endpoint: {
        type: String,
@@ -38,6 +44,8 @@
 </script>
 <template>
  <div :class="cssContainerClass">
+    <stop-environment-modal :environment="environmentInStopModal" />
    <div
      v-if="!isLoading"
      class="top-area"

--- a/app/assets/javascripts/environments/mixins/environments_mixin.js
+++ b/app/assets/javascripts/environments/mixins/environments_mixin.js
@@ -40,6 +40,7 @@ export default {
      scope: getParameterByName('scope') || 'available',
      page: getParameterByName('page') || '1',
      requestData: {},
+      environmentInStopModal: {},
    };
  },
@@ -85,7 +86,7 @@ export default {
      Flash(s__('Environments|An error occurred while fetching the environments.'));
    },
-    postAction(endpoint) {
+    postAction({ endpoint, errorMessage }) {
      if (!this.isMakingRequest) {
        this.isLoading = true;
@@ -93,7 +94,7 @@ export default {
          .then(() => this.fetchEnvironments())
          .catch(() => {
            this.isLoading = false;
-            Flash(s__('Environments|An error occurred while making the request.'));
+            Flash(errorMessage || s__('Environments|An error occurred while making the request.'));
          });
      }
    },
@@ -106,6 +107,15 @@ export default {
        .catch(this.errorCallback);
    },
+    updateStopModal(environment) {
+      this.environmentInStopModal = environment;
+    },
+    stopEnvironment(environment) {
+      const endpoint = environment.stop_path;
+      const errorMessage = s__('Environments|An error occurred while stopping the environment, please try again');
+      this.postAction({ endpoint, errorMessage });
+    },
  },
  computed: {
@@ -162,9 +172,13 @@ export default {
    });
    eventHub.$on('postAction', this.postAction);
+    eventHub.$on('requestStopEnvironment', this.updateStopModal);
+    eventHub.$on('stopEnvironment', this.stopEnvironment);
  },
-  beforeDestroyed() {
+  beforeDestroy() {
-    eventHub.$off('postAction');
+    eventHub.$off('postAction', this.postAction);
+    eventHub.$off('requestStopEnvironment', this.updateStopModal);
+    eventHub.$off('stopEnvironment', this.stopEnvironment);
  },
 };
--- a/app/assets/javascripts/environments/services/environments_service.js
+++ b/app/assets/javascripts/environments/services/environments_service.js
@@ -13,7 +13,7 @@ export default class EnvironmentsService {
  // eslint-disable-next-line class-methods-use-this
  postAction(endpoint) {
-    return axios.post(endpoint, {}, { emulateJSON: true });
+    return axios.post(endpoint, {});
  }
  getFolderContent(folderUrl) {

--- a/app/assets/javascripts/notes/stores/mutation_types.js
+++ b/app/assets/javascripts/notes/stores/mutation_types.js
 export const ADD_NEW_NOTE = 'ADD_NEW_NOTE';
 export const ADD_NEW_REPLY_TO_DISCUSSION = 'ADD_NEW_REPLY_TO_DISCUSSION';
 export const DELETE_NOTE = 'DELETE_NOTE';
-export const EXPAND_DISCUSSION = 'EXPAND_DISCUSSION';
 export const REMOVE_PLACEHOLDER_NOTES = 'REMOVE_PLACEHOLDER_NOTES';
 export const SET_NOTES_DATA = 'SET_NOTES_DATA';
 export const SET_NOTEABLE_DATA = 'SET_NOTEABLE_DATA';
@@ -11,15 +10,15 @@ export const SET_LAST_FETCHED_AT = 'SET_LAST_FETCHED_AT';
 export const SET_TARGET_NOTE_HASH = 'SET_TARGET_NOTE_HASH';
 export const SHOW_PLACEHOLDER_NOTE = 'SHOW_PLACEHOLDER_NOTE';
 export const TOGGLE_AWARD = 'TOGGLE_AWARD';
-export const TOGGLE_DISCUSSION = 'TOGGLE_DISCUSSION';
 export const UPDATE_NOTE = 'UPDATE_NOTE';
 export const UPDATE_DISCUSSION = 'UPDATE_DISCUSSION';
 export const SET_DISCUSSION_DIFF_LINES = 'SET_DISCUSSION_DIFF_LINES';
 export const SET_NOTES_FETCHED_STATE = 'SET_NOTES_FETCHED_STATE';
 // DISCUSSION
 export const COLLAPSE_DISCUSSION = 'COLLAPSE_DISCUSSION';
+export const EXPAND_DISCUSSION = 'EXPAND_DISCUSSION';
+export const TOGGLE_DISCUSSION = 'TOGGLE_DISCUSSION';
 // Issue
 export const CLOSE_ISSUE = 'CLOSE_ISSUE';

--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -224,7 +224,10 @@
  .form-control {
    position: relative;
    min-width: 200px;
-    padding: 5px 25px 6px 0;
+    padding-right: 25px;
+    padding-left: 0;
+    height: $input-height;
+    line-height: inherit;
    border-color: transparent;
    &:focus,

--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -23,7 +23,7 @@
    }
    .btn-group {
-      > a {
+      > .btn:not(.btn-danger) {
        color: $gl-text-color-secondary;
      }

--- a/app/controllers/admin/deploy_keys_controller.rb
+++ b/app/controllers/admin/deploy_keys_controller.rb
@@ -22,7 +22,7 @@ class Admin::DeployKeysController < Admin::ApplicationController
  end
  def update
-    if deploy_key.update_attributes(update_params)
+    if deploy_key.update(update_params)
      flash[:notice] = 'Deploy key was successfully updated.'
      redirect_to admin_deploy_keys_path
    else
@@ -34,7 +34,7 @@ class Admin::DeployKeysController < Admin::ApplicationController
    deploy_key.destroy
    respond_to do |format|
-      format.html { redirect_to admin_deploy_keys_path, status: 302 }
+      format.html { redirect_to admin_deploy_keys_path, status: :found }
      format.json { head :ok }
    end
  end

--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -39,7 +39,7 @@ class Admin::GroupsController < Admin::ApplicationController
  end
  def update
-    if @group.update_attributes(group_params)
+    if @group.update(group_params)
      redirect_to [:admin, @group], notice: 'Group was successfully updated.'
    else
      render "edit"

--- a/app/controllers/admin/hooks_controller.rb
+++ b/app/controllers/admin/hooks_controller.rb
@@ -23,7 +23,7 @@ class Admin::HooksController < Admin::ApplicationController
  end
  def update
-    if hook.update_attributes(hook_params)
+    if hook.update(hook_params)
      flash[:notice] = 'System hook was successfully updated.'
      redirect_to admin_hooks_path
    else
@@ -34,7 +34,7 @@ class Admin::HooksController < Admin::ApplicationController
  def destroy
    hook.destroy
-    redirect_to admin_hooks_path, status: 302
+    redirect_to admin_hooks_path, status: :found
  end
  def test

--- a/app/controllers/admin/identities_controller.rb
+++ b/app/controllers/admin/identities_controller.rb
@@ -25,7 +25,7 @@ class Admin::IdentitiesController < Admin::ApplicationController
  end
  def update
-    if @identity.update_attributes(identity_params)
+    if @identity.update(identity_params)
      RepairLdapBlockedUserService.new(@user).execute
      redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.'
    else

--- a/app/controllers/admin/impersonations_controller.rb
+++ b/app/controllers/admin/impersonations_controller.rb
@@ -11,7 +11,7 @@ class Admin::ImpersonationsController < Admin::ApplicationController
    session[:impersonator_id] = nil
-    redirect_to admin_user_path(original_user), status: 302
+    redirect_to admin_user_path(original_user), status: :found
  end
  private

--- a/app/controllers/admin/jobs_controller.rb
+++ b/app/controllers/admin/jobs_controller.rb
@@ -20,6 +20,6 @@ class Admin::JobsController < Admin::ApplicationController
  def cancel_all
    Ci::Build.running_or_pending.each(&:cancel)
-    redirect_to admin_jobs_path, status: 303
+    redirect_to admin_jobs_path, status: :see_other
  end
 end
--- a/app/controllers/admin/runner_projects_controller.rb
+++ b/app/controllers/admin/runner_projects_controller.rb
@@ -16,7 +16,7 @@ class Admin::RunnerProjectsController < Admin::ApplicationController
    runner = rp.runner
    rp.destroy
-    redirect_to admin_runner_path(runner), status: 302
+    redirect_to admin_runner_path(runner), status: :found
  end
  private

--- a/app/controllers/admin/runners_controller.rb
+++ b/app/controllers/admin/runners_controller.rb
@@ -28,7 +28,7 @@ class Admin::RunnersController < Admin::ApplicationController
  def destroy
    @runner.destroy
-    redirect_to admin_runners_path, status: 302
+    redirect_to admin_runners_path, status: :found
  end
  def resume

--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -16,7 +16,7 @@ class Admin::ServicesController < Admin::ApplicationController
  end
  def update
-    if service.update_attributes(service_params[:service])
+    if service.update(service_params[:service])
      PropagateServiceTemplateWorker.perform_async(service.id) if service.active?
      redirect_to admin_application_settings_services_path,

--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -163,7 +163,7 @@ class Admin::UsersController < Admin::ApplicationController
        format.json { head :ok }
      else
        format.html { redirect_back_or_admin_user(alert: 'There was an error removing the e-mail.') }
-        format.json { render json: 'There was an error removing the e-mail.', status: 400 }
+        format.json { render json: 'There was an error removing the e-mail.', status: :bad_request }
      end
    end
  end

--- a/app/controllers/concerns/issuable_actions.rb
+++ b/app/controllers/concerns/issuable_actions.rb
@@ -127,7 +127,7 @@ module IssuableActions
          errors: [
            "Someone edited this #{issuable.human_class_name} at the same time you did. Please refresh your browser and make sure your changes will not unintentionally remove theirs."
          ]
-        }, status: 409
+        }, status: :conflict
      end
    end
  end

--- a/app/controllers/concerns/lfs_request.rb
+++ b/app/controllers/concerns/lfs_request.rb
@@ -27,7 +27,7 @@ module LfsRequest
        message: 'Git LFS is not enabled on this GitLab server, contact your admin.',
        documentation_url: help_url
      },
-      status: 501
+      status: :not_implemented
    )
  end

--- a/app/controllers/groups/avatars_controller.rb
+++ b/app/controllers/groups/avatars_controller.rb
@@ -7,6 +7,6 @@ class Groups::AvatarsController < Groups::ApplicationController
    @group.remove_avatar!
    @group.save
-    redirect_to edit_group_path(@group), status: 302
+    redirect_to edit_group_path(@group), status: :found
  end
 end
--- a/app/controllers/groups/runners_controller.rb
+++ b/app/controllers/groups/runners_controller.rb
@@ -23,7 +23,7 @@ class Groups::RunnersController < Groups::ApplicationController
  def destroy
    @runner.destroy
-    redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), status: 302
+    redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), status: :found
  end
  def resume

--- a/app/controllers/jwt_controller.rb
+++ b/app/controllers/jwt_controller.rb
@@ -41,7 +41,7 @@ class JwtController < ApplicationController
                   "You must use a personal access token with 'api' scope for Git over HTTP.\n" \
                   "You can generate one at #{profile_personal_access_tokens_url}" }
      ]
-    }, status: 401
+    }, status: :unauthorized
  end
  def render_unauthorized
@@ -50,7 +50,7 @@ class JwtController < ApplicationController
        { code: 'UNAUTHORIZED',
          message: 'HTTP Basic: Access denied' }
      ]
-    }, status: 401
+    }, status: :unauthorized
  end
  def auth_params

--- a/app/controllers/notification_settings_controller.rb
+++ b/app/controllers/notification_settings_controller.rb
@@ -5,14 +5,14 @@ class NotificationSettingsController < ApplicationController
    return render_404 unless can_read?(resource)
    @notification_setting = current_user.notification_settings_for(resource)
-    @saved = @notification_setting.update_attributes(notification_setting_params)
+    @saved = @notification_setting.update(notification_setting_params)
    render_response
  end
  def update
    @notification_setting = current_user.notification_settings.find(params[:id])
-    @saved = @notification_setting.update_attributes(notification_setting_params)
+    @saved = @notification_setting.update(notification_setting_params)
    render_response
  end

--- a/app/controllers/profiles/active_sessions_controller.rb
+++ b/app/controllers/profiles/active_sessions_controller.rb
@@ -7,7 +7,7 @@ class Profiles::ActiveSessionsController < Profiles::ApplicationController
    ActiveSession.destroy(current_user, params[:id])
    respond_to do |format|
-      format.html { redirect_to profile_active_sessions_url, status: 302 }
+      format.html { redirect_to profile_active_sessions_url, status: :found }
      format.js { head :ok }
    end
  end

--- a/app/controllers/profiles/avatars_controller.rb
+++ b/app/controllers/profiles/avatars_controller.rb
@@ -4,6 +4,6 @@ class Profiles::AvatarsController < Profiles::ApplicationController
    Users::UpdateService.new(current_user, user: @user).execute { |user| user.remove_avatar! }
-    redirect_to profile_path, status: 302
+    redirect_to profile_path, status: :found
  end
 end
--- a/app/controllers/profiles/chat_names_controller.rb
+++ b/app/controllers/profiles/chat_names_controller.rb
@@ -39,7 +39,7 @@ class Profiles::ChatNamesController < Profiles::ApplicationController
      flash[:alert] = "Could not delete chat nickname #{@chat_name.chat_name}."
    end
-    redirect_to profile_chat_names_path, status: 302
+    redirect_to profile_chat_names_path, status: :found
  end
  private

--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -19,7 +19,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
    Emails::DestroyService.new(current_user, user: current_user).execute(@email)
    respond_to do |format|
-      format.html { redirect_to profile_emails_url, status: 302 }
+      format.html { redirect_to profile_emails_url, status: :found }
      format.js { head :ok }
    end
  end

--- a/app/controllers/profiles/gpg_keys_controller.rb
+++ b/app/controllers/profiles/gpg_keys_controller.rb
@@ -21,7 +21,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController
    @gpg_key.destroy
    respond_to do |format|
-      format.html { redirect_to profile_gpg_keys_url, status: 302 }
+      format.html { redirect_to profile_gpg_keys_url, status: :found }
      format.js { head :ok }
    end
  end
@@ -30,7 +30,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController
    @gpg_key.revoke
    respond_to do |format|
-      format.html { redirect_to profile_gpg_keys_url, status: 302 }
+      format.html { redirect_to profile_gpg_keys_url, status: :found }
      format.js { head :ok }
    end
  end

--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -26,7 +26,7 @@ class Profiles::KeysController < Profiles::ApplicationController
    Keys::DestroyService.new(current_user).execute(@key)
    respond_to do |format|
-      format.html { redirect_to profile_keys_url, status: 302 }
+      format.html { redirect_to profile_keys_url, status: :found }
      format.js { head :ok }
    end
  end

--- a/app/controllers/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -78,7 +78,7 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
  def destroy
    current_user.disable_two_factor!
-    redirect_to profile_account_path, status: 302
+    redirect_to profile_account_path, status: :found
  end
  def skip

--- a/app/controllers/projects/application_controller.rb
+++ b/app/controllers/projects/application_controller.rb
@@ -61,7 +61,7 @@ class Projects::ApplicationController < ApplicationController
  def require_non_empty_project
    # Be sure to return status code 303 to avoid a double DELETE:
    # http://api.rubyonrails.org/classes/ActionController/Redirecting.html
-    redirect_to project_path(@project), status: 303 if @project.empty_repo?
+    redirect_to project_path(@project), status: :see_other if @project.empty_repo?
  end
  def require_branch_head

--- a/app/controllers/projects/avatars_controller.rb
+++ b/app/controllers/projects/avatars_controller.rb
@@ -21,6 +21,6 @@ class Projects::AvatarsController < Projects::ApplicationController
    @project.save
-    redirect_to edit_project_path(@project), status: 302
+    redirect_to edit_project_path(@project), status: :found
  end
 end
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -98,7 +98,7 @@ class Projects::BranchesController < Projects::ApplicationController
        flash_type = result[:status] == :error ? :alert : :notice
        flash[flash_type] = result[:message]
-        redirect_to project_branches_path(@project), status: 303
+        redirect_to project_branches_path(@project), status: :see_other
      end
      format.js { render nothing: true, status: result[:return_code] }

--- a/app/controllers/projects/clusters_controller.rb
+++ b/app/controllers/projects/clusters_controller.rb
@@ -62,7 +62,7 @@ class Projects::ClustersController < Projects::ApplicationController
  def destroy
    if cluster.destroy
      flash[:notice] = _('Kubernetes cluster integration was successfully removed.')
-      redirect_to project_clusters_path(project), status: 302
+      redirect_to project_clusters_path(project), status: :found
    else
      flash[:notice] = _('Kubernetes cluster integration was not removed.')
      render :show

--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -35,7 +35,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
  end
  def update
-    if deploy_key.update_attributes(update_params)
+    if deploy_key.update(update_params)
      flash[:notice] = 'Deploy key was successfully updated.'
      redirect_to_repository_settings(@project)
    else

--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -2,7 +2,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
  layout 'project'
  before_action :authorize_read_environment!
  before_action :authorize_create_environment!, only: [:new, :create]
-  before_action :authorize_create_deployment!, only: [:stop]
+  before_action :authorize_stop_environment!, only: [:stop]
  before_action :authorize_update_environment!, only: [:edit, :update]
  before_action :authorize_admin_environment!, only: [:terminal, :terminal_websocket_authorize]
  before_action :environment, only: [:show, :edit, :update, :stop, :terminal, :terminal_websocket_authorize, :metrics]
@@ -116,7 +116,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
      set_workhorse_internal_api_content_type
      render json: Gitlab::Workhorse.terminal_websocket(terminal)
    else
-      render text: 'Not found', status: 404
+      render text: 'Not found', status: :not_found
    end
  end
@@ -175,4 +175,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
  def environment
    @environment ||= project.environments.find(params[:id])
  end
+  def authorize_stop_environment!
+    access_denied! unless can?(current_user, :stop_environment, environment)
+  end
 end
--- a/app/controllers/projects/git_http_client_controller.rb
+++ b/app/controllers/projects/git_http_client_controller.rb
@@ -53,7 +53,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController
    end
    send_challenges
-    render plain: "HTTP Basic: Access denied\n", status: 401
+    render plain: "HTTP Basic: Access denied\n", status: :unauthorized
  rescue Gitlab::Auth::MissingPersonalAccessTokenError
    render_missing_personal_access_token
  end
@@ -83,7 +83,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController
    render plain: "HTTP Basic: Access denied\n" \
                  "You must use a personal access token with 'api' scope for Git over HTTP.\n" \
                  "You can generate one at #{profile_personal_access_tokens_url}",
-           status: 401
+           status: :unauthorized
  end
  def repository

--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -24,7 +24,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
  def update
    @group_link = @project.project_group_links.find(params[:id])
-    @group_link.update_attributes(group_link_params)
+    @group_link.update(group_link_params)
  end
  def destroy
@@ -34,7 +34,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
    respond_to do |format|
      format.html do
-        redirect_to project_project_members_path(project), status: 302
+        redirect_to project_project_members_path(project), status: :found
      end
      format.js { head :ok }
    end

--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -29,7 +29,7 @@ class Projects::HooksController < Projects::ApplicationController
  end
  def update
-    if hook.update_attributes(hook_params)
+    if hook.update(hook_params)
      flash[:notice] = 'Hook was successfully updated.'
      redirect_to project_settings_integrations_path(@project)
    else
@@ -48,7 +48,7 @@ class Projects::HooksController < Projects::ApplicationController
  def destroy
    hook.destroy
-    redirect_to project_settings_integrations_path(@project), status: 302
+    redirect_to project_settings_integrations_path(@project), status: :found
  end
  private

--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -39,7 +39,7 @@ class Projects::LabelsController < Projects::ApplicationController
    else
      respond_to do |format|
        format.html { render :new }
-        format.json { render json: { message: @label.errors.messages }, status: 400 }
+        format.json { render json: { message: @label.errors.messages }, status: :bad_request }
      end
    end
  end
@@ -115,7 +115,7 @@ class Projects::LabelsController < Projects::ApplicationController
      flash[:notice] = "#{@label.title} promoted to <a href=\"#{group_labels_path(@project.group)}\">group label</a>.".html_safe
      respond_to do |format|
        format.html do
-          redirect_to(project_labels_path(@project), status: 303)
+          redirect_to(project_labels_path(@project), status: :see_other)
        end
        format.json do
          render json: { url: project_labels_path(@project) }

--- a/app/controllers/projects/lfs_api_controller.rb
+++ b/app/controllers/projects/lfs_api_controller.rb
@@ -25,7 +25,7 @@ class Projects::LfsApiController < Projects::GitHttpClientController
        message: 'Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.',
        documentation_url: "#{Gitlab.config.gitlab.url}/help"
      },
-      status: 501
+      status: :not_implemented
    )
  end

--- a/app/controllers/projects/lfs_storage_controller.rb
+++ b/app/controllers/projects/lfs_storage_controller.rb
@@ -28,7 +28,7 @@ class Projects::LfsStorageController < Projects::GitHttpClientController
    if store_file!(oid, size)
      head 200
    else
-      render plain: 'Unprocessable entity', status: 422
+      render plain: 'Unprocessable entity', status: :unprocessable_entity
    end
  rescue ActiveRecord::RecordInvalid
    render_lfs_forbidden

--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -192,7 +192,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
          deployment = environment.first_deployment_for(@merge_request.diff_head_sha)
          stop_url =
-            if environment.stop_action? && can?(current_user, :create_deployment, environment)
+            if can?(current_user, :stop_environment, environment)
              stop_project_environment_path(project, environment)
            end
@@ -227,7 +227,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
  def rebase
    RebaseWorker.perform_async(@merge_request.id, current_user.id)
-    render nothing: true, status: 200
+    render nothing: true, status: :ok
  end
  protected

--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -96,7 +96,7 @@ class Projects::MilestonesController < Projects::ApplicationController
    Milestones::DestroyService.new(project, current_user).execute(milestone)
    respond_to do |format|
-      format.html { redirect_to namespace_project_milestones_path, status: 303 }
+      format.html { redirect_to namespace_project_milestones_path, status: :see_other }
      format.js { head :ok }
    end
  end

--- a/app/controllers/projects/mirrors_controller.rb
+++ b/app/controllers/projects/mirrors_controller.rb
@@ -13,7 +13,7 @@ class Projects::MirrorsController < Projects::ApplicationController
  end
  def update
-    if project.update_attributes(mirror_params)
+    if project.update(mirror_params)
      flash[:notice] = 'Mirroring settings were successfully updated.'
    else
      flash[:alert] = project.errors.full_messages.join(', ').html_safe

--- a/app/controllers/projects/pipeline_schedules_controller.rb
+++ b/app/controllers/projects/pipeline_schedules_controller.rb
@@ -64,7 +64,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
  def destroy
    if schedule.destroy
-      redirect_to pipeline_schedules_path(@project), status: 302
+      redirect_to pipeline_schedules_path(@project), status: :found
    else
      redirect_to pipeline_schedules_path(@project),
                  status: :forbidden,

--- a/app/controllers/projects/releases_controller.rb
+++ b/app/controllers/projects/releases_controller.rb
@@ -14,7 +14,7 @@ class Projects::ReleasesController < Projects::ApplicationController
    # it exists only to save a description to each Tag.
    # If description is empty we should destroy the existing record.
    if release_params[:description].present?
-      release.update_attributes(release_params)
+      release.update(release_params)
    else
      release.destroy
    end

--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -24,7 +24,7 @@ class Projects::RepositoriesController < Projects::ApplicationController
    send_git_archive @repository, ref: @ref, format: params[:format], append_sha: append_sha
  rescue => ex
    logger.error("#{self.class.name}: #{ex}")
-    return git_not_found!
+    git_not_found!
  end
  def assign_archive_vars

--- a/app/controllers/projects/runner_projects_controller.rb
+++ b/app/controllers/projects/runner_projects_controller.rb
@@ -21,6 +21,6 @@ class Projects::RunnerProjectsController < Projects::ApplicationController
    runner_project = project.runner_projects.find(params[:id])
    runner_project.destroy
-    redirect_to project_runners_path(project), status: 302
+    redirect_to project_runners_path(project), status: :found
  end
 end
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -24,7 +24,7 @@ class Projects::RunnersController < Projects::ApplicationController
      @runner.destroy
    end
-    redirect_to project_runners_path(@project), status: 302
+    redirect_to project_runners_path(@project), status: :found
  end
  def resume

--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -34,7 +34,7 @@ class Projects::ServicesController < Projects::ApplicationController
  private
  def service_test_response
-    if @service.update_attributes(service_params[:service])
+    if @service.update(service_params[:service])
      data = @service.test_data(project, current_user)
      outcome = @service.test(data)

--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -82,7 +82,7 @@ class Projects::SnippetsController < Projects::ApplicationController
    @snippet.destroy
-    redirect_to project_snippets_path(@project), status: 302
+    redirect_to project_snippets_path(@project), status: :found
  end
  protected

--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -50,7 +50,7 @@ class Projects::TagsController < Projects::ApplicationController
    respond_to do |format|
      if result[:status] == :success
        format.html do
-          redirect_to project_tags_path(@project), status: 303
+          redirect_to project_tags_path(@project), status: :see_other
        end
        format.js

--- a/app/controllers/projects/templates_controller.rb
+++ b/app/controllers/projects/templates_controller.rb
@@ -14,6 +14,6 @@ class Projects::TemplatesController < Projects::ApplicationController
  def get_template_class
    template_types = { issue: Gitlab::Template::IssueTemplate, merge_request: Gitlab::Template::MergeRequestTemplate }.with_indifferent_access
    @template_type = template_types[params[:template_type]]
-    render json: [], status: 404 unless @template_type
+    render json: [], status: :not_found unless @template_type
  end
 end
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -50,7 +50,7 @@ class Projects::TriggersController < Projects::ApplicationController
      flash[:alert] = "Could not remove the trigger."
    end
-    redirect_to project_settings_ci_cd_path(@project), status: 302
+    redirect_to project_settings_ci_cd_path(@project), status: :found
  end
  private

--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -120,7 +120,7 @@ class Projects::WikisController < Projects::ApplicationController
  rescue ProjectWiki::CouldNotCreateWikiError
    flash[:notice] = "Could not create Wiki Repository at this time. Please try again later."
    redirect_to project_path(@project)
-    return false
+    false
  end
  def wiki_params
@@ -129,7 +129,7 @@ class Projects::WikisController < Projects::ApplicationController
  def build_page(args)
    WikiPage.new(@project_wiki).tap do |page|
-      page.update_attributes(args)
+      page.update_attributes(args) # rubocop:disable Rails/ActiveRecordAliases
    end
  end
 end
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -133,7 +133,7 @@ class ProjectsController < Projects::ApplicationController
    ::Projects::DestroyService.new(@project, current_user, {}).async_execute
    flash[:notice] = _("Project '%{project_name}' is in the process of being deleted.") % { project_name: @project.full_name }
-    redirect_to dashboard_projects_path, status: 302
+    redirect_to dashboard_projects_path, status: :found
  rescue Projects::DestroyService::DestroyError => ex
    redirect_to edit_project_path(@project), status: 302, alert: ex.message
  end

--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -32,7 +32,7 @@ class SessionsController < Devise::SessionsController
    super do |resource|
      # User has successfully signed in, so clear any unused reset token
      if resource.reset_password_token.present?
-        resource.update_attributes(reset_password_token: nil,
+        resource.update(reset_password_token: nil,
                        reset_password_sent_at: nil)
      end

--- a/app/controllers/sherlock/transactions_controller.rb
+++ b/app/controllers/sherlock/transactions_controller.rb
@@ -13,7 +13,7 @@ module Sherlock
    def destroy_all
      Gitlab::Sherlock.collection.clear
-      redirect_to :back, status: 302
+      redirect_to :back, status: :found
    end
  end
 end
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -89,7 +89,7 @@ class SnippetsController < ApplicationController
    @snippet.destroy
-    redirect_to snippets_path, status: 302
+    redirect_to snippets_path, status: :found
  end
  protected

--- a/app/helpers/time_helper.rb
+++ b/app/helpers/time_helper.rb
@@ -5,9 +5,13 @@ module TimeHelper
    seconds = interval_in_seconds - minutes * 60
    if minutes >= 1
-      "#{pluralize(minutes, "minute")} #{pluralize(seconds, "second")}"
+      if seconds % 60 == 0
+        pluralize(minutes, "minute")
      else
-      "#{pluralize(seconds, "second")}"
+        [pluralize(minutes, "minute"), pluralize(seconds, "second")].to_sentence
+      end
+    else
+      pluralize(seconds, "second")
    end
  end

--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -371,7 +371,7 @@ module Ci
    def update_coverage
      coverage = trace.extract_coverage(coverage_regex)
-      update_attributes(coverage: coverage) if coverage.present?
+      update(coverage: coverage) if coverage.present?
    end
    def parse_trace_sections!
@@ -437,9 +437,9 @@ module Ci
    end
    def artifacts_metadata_entry(path, **options)
-      artifacts_metadata.use_file do |metadata_path|
+      artifacts_metadata.open do |metadata_stream|
        metadata = Gitlab::Ci::Build::Artifacts::Metadata.new(
-          metadata_path,
+          metadata_stream,
          path,
          **options)

--- a/app/models/concerns/protected_ref.rb
+++ b/app/models/concerns/protected_ref.rb
@@ -23,7 +23,7 @@ module ProtectedRef
        # If we don't `protected_branch` or `protected_tag` would be empty and
        # `project` cannot be delegated to it, which in turn would cause validations
        # to fail.
-        has_many :"#{type}_access_levels", inverse_of: self.model_name.singular # rubocop:disable Cop/ActiveRecordDependent
+        has_many :"#{type}_access_levels", inverse_of: self.model_name.singular
        validates :"#{type}_access_levels", length: { is: 1, message: "are restricted to a single instance per #{self.model_name.human}." }

--- a/app/models/network/commit.rb
+++ b/app/models/network/commit.rb
@@ -11,8 +11,8 @@ module Network
      @parent_spaces = []
    end
-    def method_missing(m, *args, &block)
+    def method_missing(msg, *args, &block)
-      @commit.__send__(m, *args, &block) # rubocop:disable GitlabSecurity/PublicSend
+      @commit.__send__(msg, *args, &block) # rubocop:disable GitlabSecurity/PublicSend
    end
    def space

--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -107,7 +107,7 @@ class ProjectWiki
    update_project_activity
  rescue Gitlab::Git::Wiki::DuplicatePageError => e
    @error_message = "Duplicate page: #{e.message}"
-    return false
+    false
  end
  def update_page(page, content:, title: nil, format: :markdown, message: nil)

--- a/app/models/remote_mirror.rb
+++ b/app/models/remote_mirror.rb
@@ -57,7 +57,7 @@ class RemoteMirror < ActiveRecord::Base
      Gitlab::Metrics.add_event(:remote_mirrors_finished, path: remote_mirror.project.full_path)
      timestamp = Time.now
-      remote_mirror.update_attributes!(
+      remote_mirror.update!(
        last_update_at: timestamp, last_successful_update_at: timestamp, last_error: nil
      )
    end

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -462,12 +462,12 @@ class Repository
    expire_branches_cache
  end
-  def method_missing(m, *args, &block)
+  def method_missing(msg, *args, &block)
-    if m == :lookup && !block_given?
+    if msg == :lookup && !block_given?
-      lookup_cache[m] ||= {}
+      lookup_cache[msg] ||= {}
-      lookup_cache[m][args.join(":")] ||= raw_repository.__send__(m, *args, &block) # rubocop:disable GitlabSecurity/PublicSend
+      lookup_cache[msg][args.join(":")] ||= raw_repository.__send__(msg, *args, &block) # rubocop:disable GitlabSecurity/PublicSend
    else
-      raw_repository.__send__(m, *args, &block) # rubocop:disable GitlabSecurity/PublicSend
+      raw_repository.__send__(msg, *args, &block) # rubocop:disable GitlabSecurity/PublicSend
    end
  end

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -496,7 +496,7 @@ class User < ActiveRecord::Base
  def disable_two_factor!
    transaction do
-      update_attributes(
+      update(
        otp_required_for_login:      false,
        encrypted_otp_secret:        nil,
        encrypted_otp_secret_iv:     nil,
@@ -1053,7 +1053,7 @@ class User < ActiveRecord::Base
    return @global_notification_setting if defined?(@global_notification_setting)
    @global_notification_setting = notification_settings.find_or_initialize_by(source: nil)
-    @global_notification_setting.update_attributes(level: NotificationSetting.levels[DEFAULT_NOTIFICATION_LEVEL]) unless @global_notification_setting.persisted?
+    @global_notification_setting.update(level: NotificationSetting.levels[DEFAULT_NOTIFICATION_LEVEL]) unless @global_notification_setting.persisted?
    @global_notification_setting
  end
@@ -1333,8 +1333,8 @@ class User < ActiveRecord::Base
    end
  end
-  def self.unique_internal(scope, username, email_pattern, &b)
+  def self.unique_internal(scope, username, email_pattern, &block)
-    scope.first || create_unique_internal(scope, username, email_pattern, &b)
+    scope.first || create_unique_internal(scope, username, email_pattern, &block)
  end
  def self.create_unique_internal(scope, username, email_pattern, &creation_block)

--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
+# rubocop:disable Rails/ActiveRecordAliases
 class WikiPage
  PageChangedError = Class.new(StandardError)
  PageRenameError = Class.new(StandardError)

--- a/app/policies/environment_policy.rb
+++ b/app/policies/environment_policy.rb
 class EnvironmentPolicy < BasePolicy
  delegate { @subject.project }
-  condition(:stop_action_allowed) do
+  condition(:stop_with_deployment_allowed) do
-    @subject.stop_action? && can?(:update_build, @subject.stop_action)
+    @subject.stop_action? && can?(:create_deployment) && can?(:update_build, @subject.stop_action)
  end
-  rule { can?(:create_deployment) & stop_action_allowed }.enable :stop_environment
+  condition(:stop_with_update_allowed) do
+    !@subject.stop_action? && can?(:update_environment, @subject)
+  end
+  rule { stop_with_deployment_allowed | stop_with_update_allowed }.enable :stop_environment
 end
--- a/app/serializers/environment_entity.rb
+++ b/app/serializers/environment_entity.rb
@@ -7,7 +7,7 @@ class EnvironmentEntity < Grape::Entity
  expose :external_url
  expose :environment_type
  expose :last_deployment, using: DeploymentEntity
-  expose :stop_action?
+  expose :stop_action?, as: :has_stop_action
  expose :metrics_path, if: -> (environment, _) { environment.has_metrics? } do |environment|
    metrics_project_environment_path(environment.project, environment)
@@ -31,4 +31,14 @@ class EnvironmentEntity < Grape::Entity
  end
  expose :created_at, :updated_at
+  expose :can_stop do |environment|
+    environment.available? && can?(current_user, :stop_environment, environment)
+  end
+  private
+  def current_user
+    request.current_user
+  end
 end
--- a/app/services/badges/update_service.rb
+++ b/app/services/badges/update_service.rb
@@ -3,7 +3,7 @@ module Badges
    # returns the updated badge
    def execute(badge)
      if params.present?
-        badge.update_attributes(params)
+        badge.update(params)
      end
      badge

--- a/app/services/commits/change_service.rb
+++ b/app/services/commits/change_service.rb
@@ -13,8 +13,6 @@ module Commits
      # rubocop:disable GitlabSecurity/PublicSend
      message = @commit.public_send(:"#{action}_message", current_user)
-      # rubocop:disable GitlabSecurity/PublicSend
      repository.public_send(
        action,
        current_user,

--- a/app/services/issuable_base_service.rb
+++ b/app/services/issuable_base_service.rb
@@ -130,7 +130,7 @@ class IssuableBaseService < BaseService
  def create_issuable(issuable, attributes, label_ids:)
    issuable.with_transaction_returning_status do
      if issuable.save
-        issuable.update_attributes(label_ids: label_ids)
+        issuable.update(label_ids: label_ids)
      end
    end
  end

--- a/app/services/members/update_service.rb
+++ b/app/services/members/update_service.rb
@@ -6,7 +6,7 @@ module Members
      old_access_level = member.human_access
-      if member.update_attributes(params)
+      if member.update(params)
        after_execute(action: permission, old_access_level: old_access_level, member: member)
      end

--- a/app/services/merge_requests/rebase_service.rb
+++ b/app/services/merge_requests/rebase_service.rb
@@ -26,7 +26,7 @@ module MergeRequests
      Gitlab::GitLogger.info("#{log_prefix} rebased to #{rebase_sha}")
-      merge_request.update_attributes(rebase_commit_sha: rebase_sha)
+      merge_request.update(rebase_commit_sha: rebase_sha)
      Gitlab::GitLogger.info("#{log_prefix} rebase SHA saved: #{rebase_sha}")

--- a/app/services/milestones/update_service.rb
+++ b/app/services/milestones/update_service.rb
@@ -11,7 +11,7 @@ module Milestones
      end
      if params.present?
-        milestone.update_attributes(params.except(:state_event))
+        milestone.update(params.except(:state_event))
      end
      milestone

--- a/app/services/notes/update_service.rb
+++ b/app/services/notes/update_service.rb
@@ -5,7 +5,7 @@ module Notes
      old_mentioned_users = note.mentioned_users.to_a
-      note.update_attributes(params.merge(updated_by: current_user))
+      note.update(params.merge(updated_by: current_user))
      note.create_new_cross_references!(current_user)
      if note.previous_changes.include?('note')

--- a/app/services/notification_recipient_service.rb
+++ b/app/services/notification_recipient_service.rb
@@ -10,16 +10,16 @@ module NotificationRecipientService
    NotificationRecipient.new(user, *args).notifiable?
  end
-  def self.build_recipients(*a)
+  def self.build_recipients(*args)
-    Builder::Default.new(*a).notification_recipients
+    Builder::Default.new(*args).notification_recipients
  end
-  def self.build_new_note_recipients(*a)
+  def self.build_new_note_recipients(*args)
-    Builder::NewNote.new(*a).notification_recipients
+    Builder::NewNote.new(*args).notification_recipients
  end
-  def self.build_merge_request_unmergeable_recipients(*a)
+  def self.build_merge_request_unmergeable_recipients(*args)
-    Builder::MergeRequestUnmergeable.new(*a).notification_recipients
+    Builder::MergeRequestUnmergeable.new(*args).notification_recipients
  end
  module Builder
@@ -44,7 +44,6 @@ module NotificationRecipientService
        raise 'abstract'
      end
-      # rubocop:disable Rails/Delegate
      def project
        target.project
      end

--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
--- a/app/services/projects/fork_service.rb
+++ b/app/services/projects/fork_service.rb
--- a/app/services/projects/lfs_pointers/lfs_download_service.rb
+++ b/app/services/projects/lfs_pointers/lfs_download_service.rb
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
--- a/app/services/update_release_service.rb
+++ b/app/services/update_release_service.rb
--- a/app/uploaders/gitlab_uploader.rb
+++ b/app/uploaders/gitlab_uploader.rb
--- a/app/uploaders/job_artifact_uploader.rb
+++ b/app/uploaders/job_artifact_uploader.rb
--- a/app/views/projects/deployments/_actions.haml
+++ b/app/views/projects/deployments/_actions.haml
--- a/app/views/projects/deployments/_rollback.haml
+++ b/app/views/projects/deployments/_rollback.haml
--- a/app/views/projects/environments/_external_url.html.haml
+++ b/app/views/projects/environments/_external_url.html.haml
--- a/app/views/projects/environments/_stop.html.haml
+++ b/app/views/projects/environments/_stop.html.haml
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
--- a/app/views/shared/hook_logs/_content.html.haml
+++ b/app/views/shared/hook_logs/_content.html.haml
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
--- a/app/workers/object_storage/migrate_uploads_worker.rb
+++ b/app/workers/object_storage/migrate_uploads_worker.rb
--- a/changelogs/unreleased/41671-fixing-milestone-date-change-when-editing.yml
+++ b/changelogs/unreleased/41671-fixing-milestone-date-change-when-editing.yml
--- a/changelogs/unreleased/42415-omit-projects-from-get-group-endpoint.yml
+++ b/changelogs/unreleased/42415-omit-projects-from-get-group-endpoint.yml
--- a/changelogs/unreleased/48237-toggle-file-comments.yml
+++ b/changelogs/unreleased/48237-toggle-file-comments.yml
--- a/changelogs/unreleased/48537-update-avatar-only-via-api.yml
+++ b/changelogs/unreleased/48537-update-avatar-only-via-api.yml
--- a/changelogs/unreleased/48951-clean-up.yml
+++ b/changelogs/unreleased/48951-clean-up.yml
--- a/changelogs/unreleased/48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
+++ b/changelogs/unreleased/48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
--- a/changelogs/unreleased/fix-search-bar.yml
+++ b/changelogs/unreleased/fix-search-bar.yml
--- a/changelogs/unreleased/improve-metadata-access-performance.yml
+++ b/changelogs/unreleased/improve-metadata-access-performance.yml
--- a/changelogs/unreleased/jprovazn-upload-symlink.yml
+++ b/changelogs/unreleased/jprovazn-upload-symlink.yml
--- a/changelogs/unreleased/rails5-fix-48977.yml
+++ b/changelogs/unreleased/rails5-fix-48977.yml
--- a/changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml
+++ b/changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml
--- a/changelogs/unreleased/rails5-update-gemfile-lock.yml
+++ b/changelogs/unreleased/rails5-update-gemfile-lock.yml
--- a/changelogs/unreleased/upgrade-hamlit-for-ruby25.yml
+++ b/changelogs/unreleased/upgrade-hamlit-for-ruby25.yml
--- a/changelogs/unreleased/winh-stop-all-environments.yml
+++ b/changelogs/unreleased/winh-stop-all-environments.yml
--- a/config/application.rb
+++ b/config/application.rb
--- a/config/environment.rb
+++ b/config/environment.rb
--- a/config/initializers/active_record_locking.rb
+++ b/config/initializers/active_record_locking.rb
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
--- a/doc/development/fe_guide/development_process.md
+++ b/doc/development/fe_guide/development_process.md
--- a/doc/development/fe_guide/vue.md
+++ b/doc/development/fe_guide/vue.md
--- a/doc/development/i18n/proofreader.md
+++ b/doc/development/i18n/proofreader.md
--- a/doc/development/testing_guide/frontend_testing.md
+++ b/doc/development/testing_guide/frontend_testing.md
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
--- a/doc/update/11.0-to-11.1.md
+++ b/doc/update/11.0-to-11.1.md
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
--- a/lib/api/deploy_keys.rb
+++ b/lib/api/deploy_keys.rb
--- a/lib/api/environments.rb
+++ b/lib/api/environments.rb
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
--- a/lib/api/project_hooks.rb
+++ b/lib/api/project_hooks.rb
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
--- a/lib/banzai/filter/markdown_engines/common_mark.rb
+++ b/lib/banzai/filter/markdown_engines/common_mark.rb
--- a/lib/declarative_policy/base.rb
+++ b/lib/declarative_policy/base.rb
--- a/lib/declarative_policy/delegate_dsl.rb
+++ b/lib/declarative_policy/delegate_dsl.rb
--- a/lib/declarative_policy/policy_dsl.rb
+++ b/lib/declarative_policy/policy_dsl.rb
--- a/lib/declarative_policy/preferred_scope.rb
+++ b/lib/declarative_policy/preferred_scope.rb
--- a/lib/declarative_policy/rule.rb
+++ b/lib/declarative_policy/rule.rb
--- a/lib/declarative_policy/rule_dsl.rb
+++ b/lib/declarative_policy/rule_dsl.rb
--- a/lib/declarative_policy/runner.rb
+++ b/lib/declarative_policy/runner.rb
--- a/lib/gitlab/auth/o_auth/user.rb
+++ b/lib/gitlab/auth/o_auth/user.rb
--- a/lib/gitlab/background_migration/add_merge_request_diff_commits_count.rb
+++ b/lib/gitlab/background_migration/add_merge_request_diff_commits_count.rb
--- a/lib/gitlab/background_migration/archive_legacy_traces.rb
+++ b/lib/gitlab/background_migration/archive_legacy_traces.rb
--- a/lib/gitlab/background_migration/create_fork_network_memberships_range.rb
+++ b/lib/gitlab/background_migration/create_fork_network_memberships_range.rb
--- a/lib/gitlab/background_migration/create_gpg_key_subkeys_from_gpg_keys.rb
+++ b/lib/gitlab/background_migration/create_gpg_key_subkeys_from_gpg_keys.rb
--- a/lib/gitlab/background_migration/delete_diff_files.rb
+++ b/lib/gitlab/background_migration/delete_diff_files.rb
--- a/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb
+++ b/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits.rb
--- a/lib/gitlab/background_migration/fill_file_store_job_artifact.rb
+++ b/lib/gitlab/background_migration/fill_file_store_job_artifact.rb
--- a/lib/gitlab/background_migration/fill_file_store_lfs_object.rb
+++ b/lib/gitlab/background_migration/fill_file_store_lfs_object.rb
--- a/lib/gitlab/background_migration/fill_store_upload.rb
+++ b/lib/gitlab/background_migration/fill_store_upload.rb
--- a/lib/gitlab/background_migration/migrate_build_stage.rb
+++ b/lib/gitlab/background_migration/migrate_build_stage.rb
--- a/lib/gitlab/background_migration/migrate_events_to_push_event_payloads.rb
+++ b/lib/gitlab/background_migration/migrate_events_to_push_event_payloads.rb
--- a/lib/gitlab/background_migration/migrate_system_uploads_to_new_folder.rb
+++ b/lib/gitlab/background_migration/migrate_system_uploads_to_new_folder.rb
--- a/lib/gitlab/background_migration/move_personal_snippet_files.rb
+++ b/lib/gitlab/background_migration/move_personal_snippet_files.rb
--- a/lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb
+++ b/lib/gitlab/background_migration/normalize_ldap_extern_uids_range.rb
--- a/lib/gitlab/background_migration/populate_fork_networks_range.rb
+++ b/lib/gitlab/background_migration/populate_fork_networks_range.rb
--- a/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data.rb
+++ b/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data.rb
--- a/lib/gitlab/background_migration/populate_untracked_uploads.rb
+++ b/lib/gitlab/background_migration/populate_untracked_uploads.rb
--- a/lib/gitlab/background_migration/populate_untracked_uploads_dependencies.rb
+++ b/lib/gitlab/background_migration/populate_untracked_uploads_dependencies.rb
--- a/lib/gitlab/background_migration/prepare_untracked_uploads.rb
+++ b/lib/gitlab/background_migration/prepare_untracked_uploads.rb
--- a/lib/gitlab/ci/ansi2html.rb
+++ b/lib/gitlab/ci/ansi2html.rb
--- a/lib/gitlab/ci/build/artifacts/metadata.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata.rb
--- a/lib/gitlab/ci/config/entry/configurable.rb
+++ b/lib/gitlab/ci/config/entry/configurable.rb
--- a/lib/gitlab/ci/trace/http_io.rb
+++ b/lib/gitlab/ci/trace/http_io.rb
--- a/lib/gitlab/ci/trace/section_parser.rb
+++ b/lib/gitlab/ci/trace/section_parser.rb
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
--- a/lib/gitlab/diff/image_point.rb
+++ b/lib/gitlab/diff/image_point.rb
--- a/lib/gitlab/diff/inline_diff.rb
+++ b/lib/gitlab/diff/inline_diff.rb
--- a/lib/gitlab/encoding_helper.rb
+++ b/lib/gitlab/encoding_helper.rb
--- a/lib/gitlab/exclusive_lease_helpers.rb
+++ b/lib/gitlab/exclusive_lease_helpers.rb
--- a/lib/gitlab/fogbugz_import/importer.rb
+++ b/lib/gitlab/fogbugz_import/importer.rb
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
--- a/lib/gitlab/gitaly_client/operation_service.rb
+++ b/lib/gitlab/gitaly_client/operation_service.rb
--- a/lib/gitlab/gitaly_client/storage_settings.rb
+++ b/lib/gitlab/gitaly_client/storage_settings.rb
--- a/lib/gitlab/google_code_import/importer.rb
+++ b/lib/gitlab/google_code_import/importer.rb
--- a/lib/gitlab/gpg/commit.rb
+++ b/lib/gitlab/gpg/commit.rb
--- a/lib/gitlab/http_io.rb
+++ b/lib/gitlab/http_io.rb
--- a/lib/gitlab/mail_room.rb
+++ b/lib/gitlab/mail_room.rb
--- a/lib/gitlab/metrics/influx_db.rb
+++ b/lib/gitlab/metrics/influx_db.rb
--- a/lib/gitlab/metrics/method_call.rb
+++ b/lib/gitlab/metrics/method_call.rb
--- a/lib/gitlab/middleware/multipart.rb
+++ b/lib/gitlab/middleware/multipart.rb
--- a/lib/gitlab/shell.rb
+++ b/lib/gitlab/shell.rb
--- a/lib/rouge/formatters/html_gitlab.rb
+++ b/lib/rouge/formatters/html_gitlab.rb
--- a/lib/tasks/gitlab/uploads/migrate.rake
+++ b/lib/tasks/gitlab/uploads/migrate.rake
--- a/lib/uploaded_file.rb
+++ b/lib/uploaded_file.rb
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
--- a/qa/qa/runtime/release.rb
+++ b/qa/qa/runtime/release.rb
--- a/rubocop/cop/line_break_around_conditional_block.rb
+++ b/rubocop/cop/line_break_around_conditional_block.rb
--- a/spec/controllers/projects/forks_controller_spec.rb
+++ b/spec/controllers/projects/forks_controller_spec.rb
--- a/spec/controllers/projects/group_links_controller_spec.rb
+++ b/spec/controllers/projects/group_links_controller_spec.rb
--- a/spec/controllers/projects/imports_controller_spec.rb
+++ b/spec/controllers/projects/imports_controller_spec.rb
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
--- a/spec/features/dashboard/projects_spec.rb
+++ b/spec/features/dashboard/projects_spec.rb
--- a/spec/features/groups/members/request_access_spec.rb
+++ b/spec/features/groups/members/request_access_spec.rb
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
--- a/spec/features/merge_request/user_posts_diff_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb
--- a/spec/features/milestones/user_edits_milestone_spec.rb
+++ b/spec/features/milestones/user_edits_milestone_spec.rb
--- a/spec/features/profiles/password_spec.rb
+++ b/spec/features/profiles/password_spec.rb
--- a/spec/features/projects/environments/environment_spec.rb
+++ b/spec/features/projects/environments/environment_spec.rb
--- a/spec/features/projects/environments/environments_spec.rb
+++ b/spec/features/projects/environments/environments_spec.rb
--- a/spec/features/projects/files/user_browses_files_spec.rb
+++ b/spec/features/projects/files/user_browses_files_spec.rb
--- a/spec/features/projects/jobs/permissions_spec.rb
+++ b/spec/features/projects/jobs/permissions_spec.rb
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
--- a/spec/features/projects/members/user_requests_access_spec.rb
+++ b/spec/features/projects/members/user_requests_access_spec.rb
--- a/spec/features/projects/merge_requests/user_comments_on_diff_spec.rb
+++ b/spec/features/projects/merge_requests/user_comments_on_diff_spec.rb
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
--- a/spec/features/projects/remote_mirror_spec.rb
+++ b/spec/features/projects/remote_mirror_spec.rb
--- a/spec/features/projects/services/user_activates_slack_notifications_spec.rb
+++ b/spec/features/projects/services/user_activates_slack_notifications_spec.rb
--- a/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
+++ b/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb
--- a/spec/features/signed_commits_spec.rb
+++ b/spec/features/signed_commits_spec.rb
--- a/spec/finders/group_projects_finder_spec.rb
+++ b/spec/finders/group_projects_finder_spec.rb
--- a/spec/finders/joined_groups_finder_spec.rb
+++ b/spec/finders/joined_groups_finder_spec.rb
--- a/spec/finders/move_to_project_finder_spec.rb
+++ b/spec/finders/move_to_project_finder_spec.rb
--- a/spec/finders/personal_projects_finder_spec.rb
+++ b/spec/finders/personal_projects_finder_spec.rb
--- a/spec/helpers/blob_helper_spec.rb
+++ b/spec/helpers/blob_helper_spec.rb
--- a/spec/helpers/time_helper_spec.rb
+++ b/spec/helpers/time_helper_spec.rb
--- a/spec/javascripts/diffs/components/changed_files_spec.js
+++ b/spec/javascripts/diffs/components/changed_files_spec.js
--- a/spec/javascripts/diffs/components/diff_file_header_spec.js
+++ b/spec/javascripts/diffs/components/diff_file_header_spec.js
--- a/spec/javascripts/diffs/store/getters_spec.js
+++ b/spec/javascripts/diffs/store/getters_spec.js
--- a/spec/javascripts/environments/environment_rollback_spec.js
+++ b/spec/javascripts/environments/environment_rollback_spec.js
--- a/spec/javascripts/environments/environment_stop_spec.js
+++ b/spec/javascripts/environments/environment_stop_spec.js
--- a/spec/javascripts/notes/stores/actions_spec.js
+++ b/spec/javascripts/notes/stores/actions_spec.js
--- a/spec/javascripts/notes/stores/mutation_spec.js
+++ b/spec/javascripts/notes/stores/mutation_spec.js
--- a/spec/lib/gitlab/background_migration/move_personal_snippet_files_spec.rb
+++ b/spec/lib/gitlab/background_migration/move_personal_snippet_files_spec.rb
--- a/spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb
+++ b/spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
--- a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
--- a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
--- a/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb
+++ b/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb
--- a/spec/lib/gitlab/ci/trace/http_io_spec.rb
+++ b/spec/lib/gitlab/ci/trace/http_io_spec.rb
--- a/spec/lib/gitlab/middleware/multipart_spec.rb
+++ b/spec/lib/gitlab/middleware/multipart_spec.rb
--- a/spec/lib/gitlab/sanitizers/svg_spec.rb
+++ b/spec/lib/gitlab/sanitizers/svg_spec.rb
--- a/spec/lib/gitlab/shell_spec.rb
+++ b/spec/lib/gitlab/shell_spec.rb
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
--- a/spec/migrations/issues_moved_to_id_foreign_key_spec.rb
+++ b/spec/migrations/issues_moved_to_id_foreign_key_spec.rb
--- a/spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
+++ b/spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
--- a/spec/models/ci/build_metadata_spec.rb
+++ b/spec/models/ci/build_metadata_spec.rb
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
--- a/spec/models/ci/job_artifact_spec.rb
+++ b/spec/models/ci/job_artifact_spec.rb
--- a/spec/models/concerns/batch_destroy_dependent_associations_spec.rb
+++ b/spec/models/concerns/batch_destroy_dependent_associations_spec.rb
--- a/spec/models/concerns/mentionable_spec.rb
+++ b/spec/models/concerns/mentionable_spec.rb
--- a/spec/models/concerns/routable_spec.rb
+++ b/spec/models/concerns/routable_spec.rb
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_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/notification_setting_spec.rb
+++ b/spec/models/notification_setting_spec.rb
--- a/spec/models/project_feature_spec.rb
+++ b/spec/models/project_feature_spec.rb
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
--- a/spec/models/remote_mirror_spec.rb
+++ b/spec/models/remote_mirror_spec.rb
--- a/spec/models/route_spec.rb
+++ b/spec/models/route_spec.rb
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
--- a/spec/policies/environment_policy_spec.rb
+++ b/spec/policies/environment_policy_spec.rb
--- a/spec/requests/api/access_requests_spec.rb
+++ b/spec/requests/api/access_requests_spec.rb
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
--- a/spec/requests/api/helpers_spec.rb
+++ b/spec/requests/api/helpers_spec.rb
--- a/spec/requests/api/jobs_spec.rb
+++ b/spec/requests/api/jobs_spec.rb
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
--- a/spec/requests/api/pipeline_schedules_spec.rb
+++ b/spec/requests/api/pipeline_schedules_spec.rb
--- a/spec/requests/api/project_import_spec.rb
+++ b/spec/requests/api/project_import_spec.rb
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
--- a/spec/serializers/environment_entity_spec.rb
+++ b/spec/serializers/environment_entity_spec.rb
--- a/spec/serializers/environment_serializer_spec.rb
+++ b/spec/serializers/environment_serializer_spec.rb
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
--- a/spec/services/members/destroy_service_spec.rb
+++ b/spec/services/members/destroy_service_spec.rb
--- a/spec/services/merge_requests/conflicts/list_service_spec.rb
+++ b/spec/services/merge_requests/conflicts/list_service_spec.rb
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
--- a/spec/services/reset_project_cache_service_spec.rb
+++ b/spec/services/reset_project_cache_service_spec.rb
--- a/spec/services/system_hooks_service_spec.rb
+++ b/spec/services/system_hooks_service_spec.rb
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
--- a/spec/support/api/repositories_shared_context.rb
+++ b/spec/support/api/repositories_shared_context.rb
--- a/spec/support/api/time_tracking_shared_examples.rb
+++ b/spec/support/api/time_tracking_shared_examples.rb
--- a/spec/support/generate-seed-repo-rb
+++ b/spec/support/generate-seed-repo-rb
--- a/spec/support/helpers/jira_service_helper.rb
+++ b/spec/support/helpers/jira_service_helper.rb
--- a/spec/support/helpers/key_generator_helper.rb
+++ b/spec/support/helpers/key_generator_helper.rb
--- a/spec/support/http_io/http_io_helpers.rb
+++ b/spec/support/http_io/http_io_helpers.rb
--- a/spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb
+++ b/spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb
--- a/spec/uploaders/gitlab_uploader_spec.rb
+++ b/spec/uploaders/gitlab_uploader_spec.rb
--- a/spec/uploaders/job_artifact_uploader_spec.rb
+++ b/spec/uploaders/job_artifact_uploader_spec.rb
--- a/spec/views/projects/imports/new.html.haml_spec.rb
+++ b/spec/views/projects/imports/new.html.haml_spec.rb
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
--- a/spec/workers/concerns/waitable_worker_spec.rb
+++ b/spec/workers/concerns/waitable_worker_spec.rb
--- a/spec/workers/repository_import_worker_spec.rb
+++ b/spec/workers/repository_import_worker_spec.rb
--- a/spec/workers/repository_update_remote_mirror_worker_spec.rb
+++ b/spec/workers/repository_update_remote_mirror_worker_spec.rb
--- a/spec/workers/stuck_import_jobs_worker_spec.rb
+++ b/spec/workers/stuck_import_jobs_worker_spec.rb