Merge branch 'master' into feature/gb/add-regexp-variables-expression

* master: (76 commits)

Conflicts:
	lib/gitlab/untrusted_regexp.rb

.gitlab/merge_request_templates/Database Changes.md

@@ -37,9 +37,9 @@ When removing columns, tables, indexes or other structures:
 - [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
 - [ ] API support added
 - [ ] Tests added for this feature/bug
-- Review
-  - [ ] Has been reviewed by Backend
-  - [ ] Has been reviewed by Database
+- Conform by the [code review guidelines](https://docs.gitlab.com/ee/development/code_review.html)
+  - [ ] Has been reviewed by a Backend maintainer
+  - [ ] Has been reviewed by a Database specialist
 - [ ] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
 - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
 - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

CONTRIBUTING.md

@@ -728,6 +728,3 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor
 [polling-etag]: https://docs.gitlab.com/ce/development/polling.html
 [testing]: doc/development/testing_guide/index.md
 [us-english]: https://en.wikipedia.org/wiki/American_English
-
-[^1]: Please note that specs other than JavaScript specs are considered backend
-      code.

Gemfile

@@ -6,7 +6,7 @@ end
 gem_versions = {}
 gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0'      : '0.2'
 gem_versions['default_value_for']               = rails5? ? '~> 3.0.5' : '~> 3.0.0'
-gem_versions['rails']                           = rails5? ? '5.0.6'    : '4.2.10'
+gem_versions['rails']                           = rails5? ? '5.0.7'    : '4.2.10'
 gem_versions['rails-i18n']                      = rails5? ? '~> 5.1'   : '~> 4.0.9'
 # --- The end of special code for migrating to Rails 5.0 ---
 
@@ -160,7 +160,7 @@ gem 'state_machines-activerecord', '~> 0.5.1'
 gem 'acts-as-taggable-on', '~> 5.0'
 
 # Background jobs
-gem 'sidekiq', '~> 5.0'
+gem 'sidekiq', '~> 5.1'
 gem 'sidekiq-cron', '~> 0.6.0'
 gem 'redis-namespace', '~> 1.5.2'
 gem 'sidekiq-limit_fetch', '~> 3.4', require: false
@@ -325,8 +325,6 @@ group :development, :test do
   gem 'factory_bot_rails', '~> 4.8.2'
   gem 'rspec-rails', '~> 3.6.0'
   gem 'rspec-retry', '~> 0.4.5'
-  gem 'spinach-rails', '~> 0.2.1'
-  gem 'spinach-rerun-reporter', '~> 0.0.2'
   gem 'rspec_profiling', '~> 0.0.5'
   gem 'rspec-set', '~> 0.1.3'
   gem 'rspec-parameterized', require: false
@@ -343,7 +341,6 @@ group :development, :test do
 
   gem 'spring', '~> 2.0.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
-  gem 'spring-commands-spinach', '~> 1.1.0'
 
   gem 'gitlab-styles', '~> 2.3', require: false
   # Pin these dependencies, otherwise a new rule could break the CI pipelines

Gemfile.lock

@@ -131,7 +131,6 @@ GEM
     coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    colorize (0.7.7)
     commonmarker (0.17.8)
       ruby-enum (~> 0.5)
     concord (0.1.5)
@@ -288,7 +287,6 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gherkin-ruby (0.3.2)
     gitaly-proto (0.99.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
@@ -846,11 +844,11 @@ GEM
       rack
     shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
-    sidekiq (5.0.5)
+    sidekiq (5.1.3)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.4, < 5)
+      redis (>= 3.3.5, < 5)
     sidekiq-cron (0.6.0)
       rufus-scheduler (>= 3.3.0)
       sidekiq (>= 4.2.1)
@@ -869,22 +867,10 @@ GEM
     simplecov-html (0.10.0)
     slack-notifier (1.5.1)
     slop (3.6.0)
-    spinach (0.8.10)
-      colorize
-      gherkin-ruby (>= 0.3.2)
-      json
-    spinach-rails (0.2.1)
-      capybara (>= 2.0.0)
-      railties (>= 3)
-      spinach (>= 0.4)
-    spinach-rerun-reporter (0.0.2)
-      spinach (~> 0.8)
     spring (2.0.1)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    spring-commands-spinach (1.1.0)
-      spring (>= 0.9.1)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -1177,17 +1163,14 @@ DEPENDENCIES
   settingslogic (~> 2.0.9)
   sham_rack (~> 1.3.6)
   shoulda-matchers (~> 3.1.2)
-  sidekiq (~> 5.0)
+  sidekiq (~> 5.1)
   sidekiq-cron (~> 0.6.0)
   sidekiq-limit_fetch (~> 3.4)
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.14.0)
   slack-notifier (~> 1.5.1)
-  spinach-rails (~> 0.2.1)
-  spinach-rerun-reporter (~> 0.0.2)
   spring (~> 2.0.0)
   spring-commands-rspec (~> 1.0.4)
-  spring-commands-spinach (~> 1.1.0)
   sprockets (~> 3.7.0)
   sshkey (~> 1.9.0)
   stackprof (~> 0.2.10)

Gemfile.rails5.lock

@@ -4,43 +4,43 @@ GEM
     RedCloth (4.3.2)
     abstract_type (0.0.7)
     ace-rails-ap (4.1.4)
-    actioncable (5.0.6)
-      actionpack (= 5.0.6)
+    actioncable (5.0.7)
+      actionpack (= 5.0.7)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.6)
-      actionpack (= 5.0.6)
-      actionview (= 5.0.6)
-      activejob (= 5.0.6)
+    actionmailer (5.0.7)
+      actionpack (= 5.0.7)
+      actionview (= 5.0.7)
+      activejob (= 5.0.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.6)
-      actionview (= 5.0.6)
-      activesupport (= 5.0.6)
+    actionpack (5.0.7)
+      actionview (= 5.0.7)
+      activesupport (= 5.0.7)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.6)
-      activesupport (= 5.0.6)
+    actionview (5.0.7)
+      activesupport (= 5.0.7)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.6)
-      activesupport (= 5.0.6)
+    activejob (5.0.7)
+      activesupport (= 5.0.7)
       globalid (>= 0.3.6)
-    activemodel (5.0.6)
-      activesupport (= 5.0.6)
-    activerecord (5.0.6)
-      activemodel (= 5.0.6)
-      activesupport (= 5.0.6)
+    activemodel (5.0.7)
+      activesupport (= 5.0.7)
+    activerecord (5.0.7)
+      activemodel (= 5.0.7)
+      activesupport (= 5.0.7)
       arel (~> 7.0)
     activerecord_sane_schema_dumper (1.0)
       rails (>= 5, < 6)
-    activesupport (5.0.6)
+    activesupport (5.0.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     acts-as-taggable-on (5.0.0)
@@ -62,13 +62,13 @@ GEM
     asciidoctor (1.5.6.1)
     asciidoctor-plantuml (0.0.8)
       asciidoctor (~> 1.5)
-    asset_sync (2.2.0)
+    asset_sync (2.4.0)
       activemodel (>= 4.1.0)
       fog-core
       mime-types (>= 2.99)
       unf
     ast (2.4.0)
-    atomic (1.1.100)
+    atomic (1.1.99)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.1)
@@ -132,7 +132,6 @@ GEM
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    colorize (0.8.1)
     commonmarker (0.17.9)
       ruby-enum (~> 0.5)
     concord (0.1.5)
@@ -144,12 +143,10 @@ GEM
     connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
+    crass (1.0.4)
     creole (0.5.0)
     css_parser (1.6.0)
       addressable
-    d3_rails (3.5.17)
-      railties (>= 3.1.0)
     daemons (1.2.6)
     database_cleaner (1.5.3)
     debug_inspector (0.0.3)
@@ -291,8 +288,7 @@ GEM
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
-    gherkin-ruby (0.3.2)
-    gitaly-proto (0.97.0)
+    gitaly-proto (0.99.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (5.3.3)
@@ -335,9 +331,8 @@ GEM
       activesupport (>= 4.2.0)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gon (6.1.0)
+    gon (6.2.0)
       actionpack (>= 3.0)
-      json
       multi_json
       request_store (>= 1.0)
     google-api-client (0.19.8)
@@ -367,8 +362,8 @@ GEM
       rack (>= 1.3.0)
       rack-accept
       virtus (>= 1.0.0)
-    grape-entity (0.6.1)
-      activesupport (>= 5.0.0)
+    grape-entity (0.7.1)
+      activesupport (>= 4.0)
       multi_json (>= 1.3.2)
     grape-route-helpers (2.1.0)
       activesupport
@@ -420,7 +415,7 @@ GEM
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (0.9.5)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     influxdb (0.5.3)
@@ -515,7 +510,7 @@ GEM
     net-ldap (0.16.1)
     net-ssh (4.2.0)
     netrc (0.11.0)
-    nio4r (2.2.0)
+    nio4r (2.3.1)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     numerizer (0.1.1)
@@ -545,9 +540,9 @@ GEM
       omniauth (~> 1.2)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-github (1.1.2)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-gitlab (1.0.3)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
@@ -633,7 +628,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
-    prometheus-client-mmap (0.9.1)
+    prometheus-client-mmap (0.9.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -644,7 +639,7 @@ GEM
       pry (>= 0.10.4)
     public_suffix (3.0.2)
     pyu-ruby-sasl (0.0.3.3)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (4.4.1)
@@ -662,17 +657,17 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.6)
-      actioncable (= 5.0.6)
-      actionmailer (= 5.0.6)
-      actionpack (= 5.0.6)
-      actionview (= 5.0.6)
-      activejob (= 5.0.6)
-      activemodel (= 5.0.6)
-      activerecord (= 5.0.6)
-      activesupport (= 5.0.6)
+    rails (5.0.7)
+      actioncable (= 5.0.7)
+      actionmailer (= 5.0.7)
+      actionpack (= 5.0.7)
+      actionview (= 5.0.7)
+      activejob (= 5.0.7)
+      activemodel (= 5.0.7)
+      activerecord (= 5.0.7)
+      activesupport (= 5.0.7)
       bundler (>= 1.3.0)
-      railties (= 5.0.6)
+      railties (= 5.0.7)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)
@@ -683,21 +678,21 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-i18n (5.1.1)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
-    railties (5.0.6)
-      actionpack (= 5.0.6)
-      activesupport (= 5.0.6)
+    railties (5.0.7)
+      actionpack (= 5.0.7)
+      activesupport (= 5.0.7)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
     raindrops (0.19.0)
-    rake (12.3.0)
+    rake (12.3.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -874,22 +869,10 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slack-notifier (1.5.1)
-    spinach (0.8.10)
-      colorize
-      gherkin-ruby (>= 0.3.2)
-      json
-    spinach-rails (0.2.1)
-      capybara (>= 2.0.0)
-      railties (>= 3)
-      spinach (>= 0.4)
-    spinach-rerun-reporter (0.0.2)
-      spinach (~> 0.8)
     spring (2.0.2)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    spring-commands-spinach (1.1.0)
-      spring (>= 0.9.1)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -1001,7 +984,7 @@ DEPENDENCIES
   asana (~> 0.6.0)
   asciidoctor (~> 1.5.6)
   asciidoctor-plantuml (= 0.0.8)
-  asset_sync (~> 2.2.0)
+  asset_sync (~> 2.4)
   attr_encrypted (~> 3.1.0)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
@@ -1027,12 +1010,11 @@ DEPENDENCIES
   concurrent-ruby (~> 1.0.5)
   connection_pool (~> 2.0)
   creole (~> 0.5.0)
-  d3_rails (~> 3.5.0)
   database_cleaner (~> 1.5.0)
   deckar01-task_list (= 2.0.0)
   default_value_for (~> 3.0.5)
   device_detector
-  devise (~> 4.2)
+  devise (~> 4.4)
   devise-two-factor (~> 3.0.0)
   diffy (~> 3.1.0)
   doorkeeper (~> 4.3)
@@ -1063,7 +1045,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.97.0)
+  gitaly-proto (~> 0.99.0)
   github-linguist (~> 5.3.3)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
@@ -1071,12 +1053,12 @@ DEPENDENCIES
   gitlab-markup (~> 1.6.2)
   gitlab-styles (~> 2.3)
   gitlab_omniauth-ldap (~> 2.0.4)
-  gon (~> 6.1.0)
+  gon (~> 6.2)
   google-api-client (~> 0.19.8)
   google-protobuf (= 3.5.1)
   gpgme
   grape (~> 1.0)
-  grape-entity (~> 0.6.0)
+  grape-entity (~> 0.7.1)
   grape-route-helpers (~> 2.1.0)
   grape_logging (~> 1.7)
   grpc (~> 1.11.0)
@@ -1117,7 +1099,7 @@ DEPENDENCIES
   omniauth-azure-oauth2 (~> 0.0.9)
   omniauth-cas3 (~> 1.1.4)
   omniauth-facebook (~> 4.0.0)
-  omniauth-github (~> 1.1.1)
+  omniauth-github (~> 1.3)
   omniauth-gitlab (~> 1.0.2)
   omniauth-google-oauth2 (~> 0.5.3)
   omniauth-kerberos (~> 0.3.0)
@@ -1136,14 +1118,14 @@ DEPENDENCIES
   peek-sidekiq (~> 1.0.3)
   pg (~> 0.18.2)
   premailer-rails (~> 1.9.7)
-  prometheus-client-mmap (~> 0.9.1)
+  prometheus-client-mmap (~> 0.9.2)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
   rack-attack (~> 4.4.1)
   rack-cors (~> 1.0.0)
   rack-oauth2 (~> 1.2.1)
   rack-proxy (~> 0.6.0)
-  rails (= 5.0.6)
+  rails (= 5.0.7)
   rails-controller-testing
   rails-deprecated_sanitizer (~> 1.0.3)
   rails-i18n (~> 5.1)
@@ -1191,11 +1173,8 @@ DEPENDENCIES
   simple_po_parser (~> 1.1.2)
   simplecov (~> 0.14.0)
   slack-notifier (~> 1.5.1)
-  spinach-rails (~> 0.2.1)
-  spinach-rerun-reporter (~> 0.0.2)
   spring (~> 2.0.0)
   spring-commands-rspec (~> 1.0.4)
-  spring-commands-spinach (~> 1.1.0)
   sprockets (~> 3.7.0)
   sshkey (~> 1.9.0)
   stackprof (~> 0.2.10)

app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue

+<script>
+import _ from 'underscore';
+import GlModal from '~/vue_shared/components/gl_modal.vue';
+import { s__, sprintf } from '~/locale';
+
+export default {
+  components: {
+    GlModal,
+  },
+  props: {
+    deleteWikiUrl: {
+      type: String,
+      required: true,
+      default: '',
+    },
+    pageTitle: {
+      type: String,
+      required: true,
+      default: '',
+    },
+    csrfToken: {
+      type: String,
+      required: true,
+      default: '',
+    },
+  },
+  computed: {
+    message() {
+      return s__('WikiPageConfirmDelete|Are you sure you want to delete this page?');
+    },
+    title() {
+      return sprintf(
+        s__('WikiPageConfirmDelete|Delete page %{pageTitle}?'),
+        {
+          pageTitle: _.escape(this.pageTitle),
+        },
+        false,
+      );
+    },
+  },
+  methods: {
+    onSubmit() {
+      this.$refs.form.submit();
+    },
+  },
+};
+</script>
+
+<template>
+  <gl-modal
+    id="delete-wiki-modal"
+    :header-title-text="title"
+    footer-primary-button-variant="danger"
+    :footer-primary-button-text="s__('WikiPageConfirmDelete|Delete page')"
+    @submit="onSubmit"
+  >
+    {{ message }}
+    <form
+      ref="form"
+      :action="deleteWikiUrl"
+      method="post"
+      class="form-horizontal js-requires-input"
+    >
+      <input
+        ref="method"
+        type="hidden"
+        name="_method"
+        value="delete"
+      />
+      <input
+        type="hidden"
+        name="authenticity_token"
+        :value="csrfToken"
+      />
+    </form>
+  </gl-modal>
+</template>

app/assets/javascripts/pages/projects/wikis/index.js

 import $ from 'jquery';
+import Vue from 'vue';
+import Translate from '~/vue_shared/translate';
+import csrf from '~/lib/utils/csrf';
 import Wikis from './wikis';
 import ShortcutsWiki from '../../../shortcuts_wiki';
 import ZenMode from '../../../zen_mode';
 import GLForm from '../../../gl_form';
+import deleteWikiModal from './components/delete_wiki_modal.vue';
 
 document.addEventListener('DOMContentLoaded', () => {
   new Wikis(); // eslint-disable-line no-new
   new ShortcutsWiki(); // eslint-disable-line no-new
   new ZenMode(); // eslint-disable-line no-new
   new GLForm($('.wiki-form'), true); // eslint-disable-line no-new
+
+  const deleteWikiButton = document.getElementById('delete-wiki-button');
+
+  if (deleteWikiButton) {
+    Vue.use(Translate);
+
+    const { deleteWikiUrl, pageTitle } = deleteWikiButton.dataset;
+    const deleteWikiModalEl = document.getElementById('delete-wiki-modal');
+    const deleteModal = new Vue({ // eslint-disable-line
+      el: deleteWikiModalEl,
+      data: {
+        deleteWikiUrl: '',
+      },
+      render(createElement) {
+        return createElement(deleteWikiModal, {
+          props: {
+            pageTitle,
+            deleteWikiUrl,
+            csrfToken: csrf.token,
+          },
+        });
+      },
+    });
+  }
 });

app/assets/javascripts/pipelines/components/async_button.vue

-<script>
-  /* eslint-disable no-alert */
-
-  import eventHub from '../event_hub';
-  import loadingIcon from '../../vue_shared/components/loading_icon.vue';
-  import icon from '../../vue_shared/components/icon.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
-
-  export default {
-    directives: {
-      tooltip,
-    },
-    components: {
-      loadingIcon,
-      icon,
-    },
-    props: {
-      endpoint: {
-        type: String,
-        required: true,
-      },
-      title: {
-        type: String,
-        required: true,
-      },
-      icon: {
-        type: String,
-        required: true,
-      },
-      cssClass: {
-        type: String,
-        required: true,
-      },
-      pipelineId: {
-        type: Number,
-        required: true,
-      },
-      type: {
-        type: String,
-        required: true,
-      },
-    },
-    data() {
-      return {
-        isLoading: false,
-      };
-    },
-    computed: {
-      buttonClass() {
-        return `btn ${this.cssClass}`;
-      },
-    },
-    created() {
-      // We're using eventHub to listen to the modal here instead of
-      // using props because it would would make the parent components
-      // much more complex to keep track of the loading state of each button
-      eventHub.$on('postAction', this.setLoading);
-    },
-    beforeDestroy() {
-      eventHub.$off('postAction', this.setLoading);
-    },
-    methods: {
-      onClick() {
-        eventHub.$emit('openConfirmationModal', {
-          pipelineId: this.pipelineId,
-          endpoint: this.endpoint,
-          type: this.type,
-        });
-      },
-      setLoading(endpoint) {
-        if (endpoint === this.endpoint) {
-          this.isLoading = true;
-        }
-      },
-    },
-  };
-</script>
-
-<template>
-  <button
-    v-tooltip
-    type="button"
-    @click="onClick"
-    :class="buttonClass"
-    :title="title"
-    :aria-label="title"
-    data-container="body"
-    data-placement="top"
-    :disabled="isLoading">
-    <icon
-      :name="icon"
-    />
-    <loading-icon v-if="isLoading" />
-  </button>
-</template>

app/assets/javascripts/pipelines/components/pipelines_table.vue

 <script>
-  import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
+  import Modal from '~/vue_shared/components/gl_modal.vue';
   import { s__, sprintf } from '~/locale';
-  import pipelinesTableRowComponent from './pipelines_table_row.vue';
+  import PipelinesTableRowComponent from './pipelines_table_row.vue';
   import eventHub from '../event_hub';
 
   /**
@@ -11,8 +11,8 @@
    */
   export default {
     components: {
-      pipelinesTableRowComponent,
-      DeprecatedModal,
+      PipelinesTableRowComponent,
+      Modal,
     },
     props: {
       pipelines: {
@@ -37,30 +37,18 @@
       return {
         pipelineId: '',
         endpoint: '',
-        type: '',
       };
     },
     computed: {
       modalTitle() {
-        return this.type === 'stop' ?
-          sprintf(s__('Pipeline|Stop pipeline #%{pipelineId}?'), {
-            pipelineId: `'${this.pipelineId}'`,
-          }, false) :
-          sprintf(s__('Pipeline|Retry pipeline #%{pipelineId}?'), {
-            pipelineId: `'${this.pipelineId}'`,
-          }, false);
+        return sprintf(s__('Pipeline|Stop pipeline #%{pipelineId}?'), {
+          pipelineId: `${this.pipelineId}`,
+        }, false);
       },
       modalText() {
-        return this.type === 'stop' ?
-          sprintf(s__('Pipeline|You’re about to stop pipeline %{pipelineId}.'), {
-            pipelineId: `<strong>#${this.pipelineId}</strong>`,
-          }, false) :
-          sprintf(s__('Pipeline|You’re about to retry pipeline %{pipelineId}.'), {
-            pipelineId: `<strong>#${this.pipelineId}</strong>`,
-          }, false);
-      },
-      primaryButtonLabel() {
-        return this.type === 'stop' ? s__('Pipeline|Stop pipeline') : s__('Pipeline|Retry pipeline');
+        return sprintf(s__('Pipeline|You’re about to stop pipeline %{pipelineId}.'), {
+          pipelineId: `<strong>#${this.pipelineId}</strong>`,
+        }, false);
       },
     },
     created() {
@@ -73,7 +61,6 @@
       setModalData(data) {
         this.pipelineId = data.pipelineId;
         this.endpoint = data.endpoint;
-        this.type = data.type;
       },
       onSubmit() {
         eventHub.$emit('postAction', this.endpoint);
@@ -120,20 +107,16 @@
       :auto-devops-help-path="autoDevopsHelpPath"
       :view-type="viewType"
     />
-    <deprecated-modal
+
+    <modal
       id="confirmation-modal"
-      :title="modalTitle"
-      :text="modalText"
-      kind="danger"
-      :primary-button-label="primaryButtonLabel"
+      :header-title-text="modalTitle"
+      footer-primary-button-variant="danger"
+      :footer-primary-button-text="s__('Pipeline|Stop pipeline')"
       @submit="onSubmit"
     >
-      <template
-        slot="body"
-        slot-scope="props"
-      >
-        <p v-html="props.text"></p>
-      </template>
-    </deprecated-modal>
+      <span v-html="modalText"></span>
+    </modal>
+
   </div>
 </template>

app/assets/javascripts/pipelines/components/pipelines_table_row.vue

 <script>
-  /* eslint-disable no-param-reassign */
-  import asyncButtonComponent from './async_button.vue';
-  import pipelinesActionsComponent from './pipelines_actions.vue';
-  import pipelinesArtifactsComponent from './pipelines_artifacts.vue';
-  import ciBadge from '../../vue_shared/components/ci_badge_link.vue';
-  import pipelineStage from './stage.vue';
-  import pipelineUrl from './pipeline_url.vue';
-  import pipelinesTimeago from './time_ago.vue';
-  import commitComponent from '../../vue_shared/components/commit.vue';
+  import eventHub from '../event_hub';
+  import PipelinesActionsComponent from './pipelines_actions.vue';
+  import PipelinesArtifactsComponent from './pipelines_artifacts.vue';
+  import CiBadge from '../../vue_shared/components/ci_badge_link.vue';
+  import PipelineStage from './stage.vue';
+  import PipelineUrl from './pipeline_url.vue';
+  import PipelinesTimeago from './time_ago.vue';
+  import CommitComponent from '../../vue_shared/components/commit.vue';
+  import LoadingButton from '../../vue_shared/components/loading_button.vue';
+  import Icon from '../../vue_shared/components/icon.vue';
 
   /**
    * Pipeline table row.
@@ -16,14 +17,15 @@
    */
   export default {
     components: {
-      asyncButtonComponent,
-      pipelinesActionsComponent,
-      pipelinesArtifactsComponent,
-      commitComponent,
-      pipelineStage,
-      pipelineUrl,
-      ciBadge,
-      pipelinesTimeago,
+      PipelinesActionsComponent,
+      PipelinesArtifactsComponent,
+      CommitComponent,
+      PipelineStage,
+      PipelineUrl,
+      CiBadge,
+      PipelinesTimeago,
+      LoadingButton,
+      Icon,
     },
     props: {
       pipeline: {
@@ -44,6 +46,12 @@
         required: true,
       },
     },
+    data() {
+      return {
+        isRetrying: false,
+        isCancelling: false,
+      };
+    },
     computed: {
       /**
        * If provided, returns the commit tag.
@@ -119,8 +127,10 @@
         if (this.pipeline.ref) {
           return Object.keys(this.pipeline.ref).reduce((accumulator, prop) => {
             if (prop === 'path') {
+              // eslint-disable-next-line no-param-reassign
               accumulator.ref_url = this.pipeline.ref[prop];
             } else {
+              // eslint-disable-next-line no-param-reassign
               accumulator[prop] = this.pipeline.ref[prop];
             }
             return accumulator;
@@ -216,6 +226,21 @@
         return this.viewType === 'child';
       },
     },
+
+    methods: {
+      handleCancelClick() {
+        this.isCancelling = true;
+
+        eventHub.$emit('openConfirmationModal', {
+          pipelineId: this.pipeline.id,
+          endpoint: this.pipeline.cancel_path,
+        });
+      },
+      handleRetryClick() {
+        this.isRetrying = true;
+        eventHub.$emit('retryPipeline', this.pipeline.retry_path);
+      },
+    },
   };
 </script>
 <template>
@@ -287,7 +312,8 @@
 
     <div
       v-if="displayPipelineActions"
-      class="table-section section-20 table-button-footer pipeline-actions">
+      class="table-section section-20 table-button-footer pipeline-actions"
+    >
       <div class="btn-group table-action-buttons">
         <pipelines-actions-component
           v-if="pipeline.details.manual_actions.length"
@@ -300,29 +326,27 @@
           :artifacts="pipeline.details.artifacts"
         />
 
-        <async-button-component
+        <loading-button
           v-if="pipeline.flags.retryable"
-          :endpoint="pipeline.retry_path"
-          css-class="js-pipelines-retry-button btn-default btn-retry"
-          title="Retry"
-          icon="repeat"
-          :pipeline-id="pipeline.id"
-          data-toggle="modal"
-          data-target="#confirmation-modal"
-          type="retry"
-        />
+          @click="handleRetryClick"
+          container-class="js-pipelines-retry-button btn btn-default btn-retry"
+          :loading="isRetrying"
+          :disabled="isRetrying"
+        >
+          <icon name="repeat" />
+        </loading-button>
 
-        <async-button-component
+        <loading-button
           v-if="pipeline.flags.cancelable"
-          :endpoint="pipeline.cancel_path"
-          css-class="js-pipelines-cancel-button btn-remove"
-          title="Stop"
-          icon="close"
-          :pipeline-id="pipeline.id"
+          @click="handleCancelClick"
           data-toggle="modal"
           data-target="#confirmation-modal"
-          type="stop"
-        />
+          container-class="js-pipelines-cancel-button btn btn-remove"
+          :loading="isCancelling"
+          :disabled="isCancelling"
+        >
+          <icon name="close" />
+        </loading-button>
       </div>
     </div>
   </div>

app/assets/javascripts/pipelines/mixins/pipelines.js

@@ -53,10 +53,12 @@ export default {
     });
 
     eventHub.$on('postAction', this.postAction);
+    eventHub.$on('retryPipeline', this.postAction);
     eventHub.$on('clickedDropdown', this.updateTable);
   },
   beforeDestroy() {
     eventHub.$off('postAction', this.postAction);
+    eventHub.$off('retryPipeline', this.postAction);
     eventHub.$off('clickedDropdown', this.updateTable);
   },
   destroyed() {

app/assets/javascripts/user_callout.js

@@ -15,7 +15,7 @@ export default class UserCallout {
 
   init() {
     if (!this.isCalloutDismissed || this.isCalloutDismissed === 'false') {
-      $('.js-close-callout').on('click', e => this.dismissCallout(e));
+      this.userCalloutBody.find('.js-close-callout').on('click', e => this.dismissCallout(e));
     }
   }
 
@@ -23,12 +23,15 @@ export default class UserCallout {
     const $currentTarget = $(e.currentTarget);
 
     if (this.options.setCalloutPerProject) {
-      Cookies.set(this.cookieName, 'true', { expires: 365, path: this.userCalloutBody.data('projectPath') });
+      Cookies.set(this.cookieName, 'true', {
+        expires: 365,
+        path: this.userCalloutBody.data('projectPath'),
+      });
     } else {
       Cookies.set(this.cookieName, 'true', { expires: 365 });
     }
 
-    if ($currentTarget.hasClass('close')) {
+    if ($currentTarget.hasClass('close') || $currentTarget.hasClass('js-close')) {
       this.userCalloutBody.remove();
     }
   }

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue

-<script>
-  export default {
-    name: 'MRWidgetMaintainerEdit',
-    props: {
-      maintainerEditAllowed: {
-        type: Boolean,
-        default: false,
-        required: false,
-      },
-    },
-  };
-</script>
-
-<template>
-  <section class="mr-info-list mr-links">
-    <p v-if="maintainerEditAllowed">
-      {{ s__("mrWidget|Allows edits from maintainers") }}
-    </p>
-  </section>
-</template>

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js → app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue

@@ -10,6 +10,6 @@ In EE, the configuration extends this object to add a functioning squash-before-
 button.
 */
 
-export default {
-  template: '',
-};
+<script>
+  export default {};
+</script>

app/assets/javascripts/vue_merge_request_widget/dependencies.js

@@ -15,7 +15,6 @@ export { default as WidgetHeader } from './components/mr_widget_header.vue';
 export { default as WidgetMergeHelp } from './components/mr_widget_merge_help.vue';
 export { default as WidgetPipeline } from './components/mr_widget_pipeline.vue';
 export { default as Deployment } from './components/deployment.vue';
-export { default as WidgetMaintainerEdit } from './components/mr_widget_maintainer_edit.vue';
 export { default as WidgetRelatedLinks } from './components/mr_widget_related_links.vue';
 export { default as MergedState } from './components/states/mr_widget_merged.vue';
 export { default as FailedToMerge } from './components/states/mr_widget_failed_to_merge.vue';
@@ -41,8 +40,8 @@ export { default as MRWidgetService } from './services/mr_widget_service';
 export { default as eventHub } from './event_hub';
 export { default as getStateKey } from './stores/get_state_key';
 export { default as stateMaps } from './stores/state_maps';
-export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge';
+export { default as SquashBeforeMerge } from './components/states/mr_widget_squash_before_merge.vue';
 export { default as notify } from '../lib/utils/notify';
 export { default as SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue';
 
-export { default as mrWidgetOptions } from './mr_widget_options';
+export { default as mrWidgetOptions } from './mr_widget_options.vue';

app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js → app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue

+<script>
+
 import Project from '~/pages/projects/project';
 import SmartInterval from '~/smart_interval';
-import Flash from '../flash';
+import createFlash from '../flash';
 import {
   WidgetHeader,
   WidgetMergeHelp,
   WidgetPipeline,
   Deployment,
-  WidgetMaintainerEdit,
   WidgetRelatedLinks,
   MergedState,
   ClosedState,
@@ -40,10 +41,39 @@ import { setFavicon } from '../lib/utils/common_utils';
 export default {
   el: '#js-vue-mr-widget',
   name: 'MRWidget',
+  components: {
+    'mr-widget-header': WidgetHeader,
+    'mr-widget-merge-help': WidgetMergeHelp,
+    'mr-widget-pipeline': WidgetPipeline,
+    Deployment,
+    'mr-widget-related-links': WidgetRelatedLinks,
+    'mr-widget-merged': MergedState,
+    'mr-widget-closed': ClosedState,
+    'mr-widget-merging': MergingState,
+    'mr-widget-failed-to-merge': FailedToMerge,
+    'mr-widget-wip': WorkInProgressState,
+    'mr-widget-archived': ArchivedState,
+    'mr-widget-conflicts': ConflictsState,
+    'mr-widget-nothing-to-merge': NothingToMergeState,
+    'mr-widget-not-allowed': NotAllowedState,
+    'mr-widget-missing-branch': MissingBranchState,
+    'mr-widget-ready-to-merge': ReadyToMergeState,
+    'sha-mismatch': ShaMismatchState,
+    'mr-widget-squash-before-merge': SquashBeforeMerge,
+    'mr-widget-checking': CheckingState,
+    'mr-widget-unresolved-discussions': UnresolvedDiscussionsState,
+    'mr-widget-pipeline-blocked': PipelineBlockedState,
+    'mr-widget-pipeline-failed': PipelineFailedState,
+    'mr-widget-merge-when-pipeline-succeeds': MergeWhenPipelineSucceedsState,
+    'mr-widget-auto-merge-failed': AutoMergeFailed,
+    'mr-widget-rebase': RebaseState,
+    SourceBranchRemovalStatus,
+  },
   props: {
     mrData: {
       type: Object,
       required: false,
+      default: null,
     },
   },
   data() {
@@ -72,6 +102,13 @@ export default {
         (!this.mr.isNothingToMergeState && !this.mr.isMergedState);
     },
   },
+  created() {
+    this.initPolling();
+    this.bindEventHubListeners();
+  },
+  mounted() {
+    this.handleMounted();
+  },
   methods: {
     createService(store) {
       const endpoints = {
@@ -99,7 +136,7 @@ export default {
             cb.call(null, data);
           }
         })
-        .catch(() => new Flash('Something went wrong. Please try again.'));
+        .catch(() => createFlash('Something went wrong. Please try again.'));
     },
     initPolling() {
       this.pollingInterval = new SmartInterval({
@@ -134,7 +171,7 @@ export default {
           }
         })
         .catch(() => {
-          new Flash('Something went wrong while fetching the environments for this merge request. Please try again.'); // eslint-disable-line
+          createFlash('Something went wrong while fetching the environments for this merge request. Please try again.'); // eslint-disable-line
         });
     },
     fetchActionsContent() {
@@ -147,7 +184,7 @@ export default {
             Project.initRefSwitcher();
           }
         })
-        .catch(() => new Flash('Something went wrong. Please try again.'));
+        .catch(() => createFlash('Something went wrong. Please try again.'));
     },
     handleNotification(data) {
       if (data.ci_status === this.mr.ciStatus) return;
@@ -202,76 +239,53 @@ export default {
       this.initDeploymentsPolling();
     },
   },
-  created() {
-    this.initPolling();
-    this.bindEventHubListeners();
-  },
-  mounted() {
-    this.handleMounted();
-  },
-  components: {
-    'mr-widget-header': WidgetHeader,
-    'mr-widget-merge-help': WidgetMergeHelp,
-    'mr-widget-pipeline': WidgetPipeline,
-    Deployment,
-    'mr-widget-maintainer-edit': WidgetMaintainerEdit,
-    'mr-widget-related-links': WidgetRelatedLinks,
-    'mr-widget-merged': MergedState,
-    'mr-widget-closed': ClosedState,
-    'mr-widget-merging': MergingState,
-    'mr-widget-failed-to-merge': FailedToMerge,
-    'mr-widget-wip': WorkInProgressState,
-    'mr-widget-archived': ArchivedState,
-    'mr-widget-conflicts': ConflictsState,
-    'mr-widget-nothing-to-merge': NothingToMergeState,
-    'mr-widget-not-allowed': NotAllowedState,
-    'mr-widget-missing-branch': MissingBranchState,
-    'mr-widget-ready-to-merge': ReadyToMergeState,
-    'mr-widget-sha-mismatch': ShaMismatchState,
-    'mr-widget-squash-before-merge': SquashBeforeMerge,
-    'mr-widget-checking': CheckingState,
-    'mr-widget-unresolved-discussions': UnresolvedDiscussionsState,
-    'mr-widget-pipeline-blocked': PipelineBlockedState,
-    'mr-widget-pipeline-failed': PipelineFailedState,
-    'mr-widget-merge-when-pipeline-succeeds': MergeWhenPipelineSucceedsState,
-    'mr-widget-auto-merge-failed': AutoMergeFailed,
-    'mr-widget-rebase': RebaseState,
-    SourceBranchRemovalStatus,
-  },
-  template: `
-    <div class="mr-state-widget prepend-top-default">
-      <mr-widget-header :mr="mr" />
-      <mr-widget-pipeline
-        v-if="shouldRenderPipelines"
-        :pipeline="mr.pipeline"
-        :ci-status="mr.ciStatus"
-        :has-ci="mr.hasCI"
-        />
-      <deployment
-        v-for="deployment in mr.deployments"
-        :key="deployment.id"
-        :deployment="deployment"
+};
+</script>
+<template>
+  <div class="mr-state-widget prepend-top-default">
+    <mr-widget-header
+      :mr="mr"
+    />
+    <mr-widget-pipeline
+      v-if="shouldRenderPipelines"
+      :pipeline="mr.pipeline"
+      :ci-status="mr.ciStatus"
+      :has-ci="mr.hasCI"
+    />
+    <deployment
+      v-for="deployment in mr.deployments"
+      :key="deployment.id"
+      :deployment="deployment"
+    />
+    <div class="mr-widget-section">
+      <component
+        :is="componentName"
+        :mr="mr"
+        :service="service"
+      />
+
+      <section
+        v-if="mr.maintainerEditAllowed"
+        class="mr-info-list mr-links"
+      >
+        {{ s__("mrWidget|Allows edits from maintainers") }}
+      </section>
+
+      <mr-widget-related-links
+        v-if="shouldRenderRelatedLinks"
+        :state="mr.state"
+        :related-links="mr.relatedLinks"
+      />
+
+      <source-branch-removal-status
+        v-if="shouldRenderSourceBranchRemovalStatus"
       />
-      <div class="mr-widget-section">
-        <component
-          :is="componentName"
-          :mr="mr"
-          :service="service" />
-        <mr-widget-maintainer-edit
-          :maintainerEditAllowed="mr.maintainerEditAllowed" />
-        <mr-widget-related-links
-          v-if="shouldRenderRelatedLinks"
-          :state="mr.state"
-          :related-links="mr.relatedLinks" />
-        <source-branch-removal-status
-          v-if="shouldRenderSourceBranchRemovalStatus"
-        />
-      </div>
-      <div
-        class="mr-widget-footer"
-        v-if="shouldRenderMergeHelp">
-        <mr-widget-merge-help />
-      </div>
     </div>
-  `,
-};
+    <div
+      class="mr-widget-footer"
+      v-if="shouldRenderMergeHelp"
+    >
+      <mr-widget-merge-help />
+    </div>
+  </div>
+</template>

app/assets/javascripts/vue_shared/components/loading_button.vue

@@ -70,12 +70,14 @@
       />
     </transition>
     <transition name="fade">
-      <span
-        v-if="label"
-        class="js-loading-button-label"
-      >
-        {{ label }}
-      </span>
+      <slot>
+        <span
+          v-if="label"
+          class="js-loading-button-label"
+        >
+          {{ label }}
+        </span>
+      </slot>
     </transition>
   </button>
 </template>

app/controllers/application_controller.rb

@@ -13,8 +13,7 @@ class ApplicationController < ActionController::Base
 
   before_action :authenticate_sessionless_user!
   before_action :authenticate_user!
-  before_action :enforce_terms!, if: -> { Gitlab::CurrentSettings.current_application_settings.enforce_terms },
-                                 unless: :peek_request?
+  before_action :enforce_terms!, if: :should_enforce_terms?
   before_action :validate_user_service_ticket!
   before_action :check_password_expiration
   before_action :ldap_security_check
@@ -373,4 +372,10 @@ class ApplicationController < ActionController::Base
   def peek_request?
     request.path.start_with?('/-/peek')
   end
+
+  def should_enforce_terms?
+    return false unless Gitlab::CurrentSettings.current_application_settings.enforce_terms
+
+    !(peek_request? || devise_controller?)
+  end
 end

app/controllers/concerns/send_file_upload.rb

@@ -2,6 +2,10 @@ module SendFileUpload
   def send_upload(file_upload, send_params: {}, redirect_params: {}, attachment: nil, disposition: 'attachment')
     if attachment
       redirect_params[:query] = { "response-content-disposition" => "#{disposition};filename=#{attachment.inspect}" }
+      # By default, Rails will send uploads with an extension of .js with a
+      # content-type of text/javascript, which will trigger Rails'
+      # cross-origin JavaScript protection.
+      send_params[:content_type] = 'text/plain' if File.extname(attachment) == '.js'
       send_params.merge!(filename: attachment, disposition: disposition)
     end
 

app/controllers/groups/group_members_controller.rb

@@ -11,13 +11,20 @@ class Groups::GroupMembersController < Groups::ApplicationController
                                   :override
 
   def index
+    can_manage_members = can?(current_user, :admin_group_member, @group)
+
     @sort = params[:sort].presence || sort_value_name
     @project = @group.projects.find(params[:project_id]) if params[:project_id]
 
     @members = GroupMembersFinder.new(@group).execute
-    @members = @members.non_invite unless can?(current_user, :admin_group, @group)
+    @members = @members.non_invite unless can_manage_members
     @members = @members.search(params[:search]) if params[:search].present?
     @members = @members.sort_by_attribute(@sort)
+
+    if can_manage_members && params[:two_factor].present?
+      @members = @members.filter_by_2fa(params[:two_factor])
+    end
+
     @members = @members.page(params[:page]).per(50)
     @members = present_members(@members.includes(:user))
 

app/controllers/projects/notes_controller.rb

@@ -8,19 +8,6 @@ class Projects::NotesController < Projects::ApplicationController
   before_action :authorize_create_note!, only: [:create]
   before_action :authorize_resolve_note!, only: [:resolve, :unresolve]
 
-  #
-  # This is a fix to make spinach feature tests passing:
-  # Controller actions are returned from AbstractController::Base and methods of parent classes are
-  #   excluded in order to return only specific controller related methods.
-  # That is ok for the app (no :create method in ancestors)
-  #   but fails for tests because there is a :create method on FactoryBot (one of the ancestors)
-  #
-  # see https://github.com/rails/rails/blob/v4.2.7/actionpack/lib/abstract_controller/base.rb#L78
-  #
-  def create
-    super
-  end
-
   def delete_attachment
     note.remove_attachment!
     note.update_attribute(:attachment, nil)

app/controllers/projects/pipelines_controller.rb

@@ -181,4 +181,8 @@ class Projects::PipelinesController < Projects::ApplicationController
     # Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/42343
     Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42339')
   end
+
+  def authorize_update_pipeline!
+    return access_denied! unless can?(current_user, :update_pipeline, @pipeline)
+  end
 end

app/controllers/users/terms_controller.rb

@@ -3,6 +3,10 @@ module Users
     include InternalRedirect
 
     skip_before_action :enforce_terms!
+    skip_before_action :check_password_expiration
+    skip_before_action :check_two_factor_requirement
+    skip_before_action :require_email
+
     before_action :terms
 
     layout 'terms'

app/helpers/events_helper.rb

@@ -41,7 +41,7 @@ module EventsHelper
     key = key.to_s
     active = 'active' if @event_filter.active?(key)
     link_opts = {
-      class: "event-filter-link has-tooltip",
+      class: "event-filter-link",
       id:    "#{key}_event_filter",
       title: tooltip
     }

app/helpers/users_helper.rb

@@ -42,22 +42,11 @@ module UsersHelper
 
     items << :sign_out if current_user
 
-    # TODO: Remove these conditions when the permissions are prevented in
-    # https://gitlab.com/gitlab-org/gitlab-ce/issues/45849
-    terms_not_enforced = !Gitlab::CurrentSettings
-                                .current_application_settings
-                                .enforce_terms?
-    required_terms_accepted = terms_not_enforced || current_user.terms_accepted?
+    return items if current_user&.required_terms_not_accepted?
 
-    items << :help if required_terms_accepted
-
-    if can?(current_user, :read_user, current_user) && required_terms_accepted
-      items << :profile
-    end
-
-    if can?(current_user, :update_user, current_user) && required_terms_accepted
-      items << :settings
-    end
+    items << :help
+    items << :profile if can?(current_user, :read_user, current_user)
+    items << :settings if can?(current_user, :update_user, current_user)
 
     items
   end

app/models/ci/pipeline.rb

@@ -37,12 +37,16 @@ module Ci
     delegate :id, to: :project, prefix: true
     delegate :full_path, to: :project, prefix: true
 
-    validates :source, exclusion: { in: %w(unknown), unless: :importing? }, on: :create
     validates :sha, presence: { unless: :importing? }
     validates :ref, presence: { unless: :importing? }
     validates :status, presence: { unless: :importing? }
     validate :valid_commit_sha, unless: :importing?
 
+    # Replace validator below with
+    # `validates :source, presence: { unless: :importing? }, on: :create`
+    # when removing Gitlab.rails5? code.
+    validate :valid_source, unless: :importing?, on: :create
+
     after_create :keep_around_commits, unless: :importing?
 
     enum source: {
@@ -601,5 +605,11 @@ module Ci
       project.repository.keep_around(self.sha)
       project.repository.keep_around(self.before_sha)
     end
+
+    def valid_source
+      if source.nil? || source == "unknown"
+        errors.add(:source, "invalid source")
+      end
+    end
   end
 end

app/models/concerns/routable.rb

@@ -4,7 +4,9 @@ module Routable
   extend ActiveSupport::Concern
 
   included do
-    has_one :route, as: :source, autosave: true, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
+    # Remove `inverse_of: source` when upgraded to rails 5.2
+    # See https://github.com/rails/rails/pull/28808
+    has_one :route, as: :source, autosave: true, dependent: :destroy, inverse_of: :source # rubocop:disable Cop/ActiveRecordDependent
     has_many :redirect_routes, as: :source, autosave: true, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
 
     validates :route, presence: true

app/models/member.rb

@@ -96,6 +96,17 @@ class Member < ActiveRecord::Base
       joins(:user).merge(User.search(query))
     end
 
+    def filter_by_2fa(value)
+      case value
+      when 'enabled'
+        left_join_users.merge(User.with_two_factor_indistinct)
+      when 'disabled'
+        left_join_users.merge(User.without_two_factor)
+      else
+        all
+      end
+    end
+
     def sort_by_attribute(method)
       case method.to_s
       when 'access_level_asc' then reorder(access_level: :asc)

app/models/user.rb

@@ -237,14 +237,18 @@ class User < ActiveRecord::Base
   scope :order_recent_sign_in, -> { reorder(Gitlab::Database.nulls_last_order('current_sign_in_at', 'DESC')) }
   scope :order_oldest_sign_in, -> { reorder(Gitlab::Database.nulls_last_order('current_sign_in_at', 'ASC')) }
 
-  def self.with_two_factor
+  def self.with_two_factor_indistinct
     joins("LEFT OUTER JOIN u2f_registrations AS u2f ON u2f.user_id = users.id")
-      .where("u2f.id IS NOT NULL OR otp_required_for_login = ?", true).distinct(arel_table[:id])
+      .where("u2f.id IS NOT NULL OR users.otp_required_for_login = ?", true)
+  end
+
+  def self.with_two_factor
+    with_two_factor_indistinct.distinct(arel_table[:id])
   end
 
   def self.without_two_factor
     joins("LEFT OUTER JOIN u2f_registrations AS u2f ON u2f.user_id = users.id")
-      .where("u2f.id IS NULL AND otp_required_for_login = ?", false)
+      .where("u2f.id IS NULL AND users.otp_required_for_login = ?", false)
   end
 
   #
@@ -1193,6 +1197,11 @@ class User < ActiveRecord::Base
     accepted_term_id.present?
   end
 
+  def required_terms_not_accepted?
+    Gitlab::CurrentSettings.current_application_settings.enforce_terms? &&
+      !terms_accepted?
+  end
+
   protected
 
   # override, from Devise::Validatable

app/policies/ci/build_policy.rb

@@ -14,11 +14,20 @@ module Ci
       @subject.triggered_by?(@user)
     end
 
+    condition(:branch_allows_maintainer_push) do
+      @subject.project.branch_allows_maintainer_push?(@user, @subject.ref)
+    end
+
     rule { protected_ref }.policy do
       prevent :update_build
       prevent :erase_build
     end
 
     rule { can?(:admin_build) | (can?(:update_build) & owner_of_job) }.enable :erase_build
+
+    rule { can?(:public_access) & branch_allows_maintainer_push }.policy do
+      enable :update_build
+      enable :update_commit_status
+    end
   end
 end

app/policies/ci/pipeline_policy.rb

@@ -4,8 +4,16 @@ module Ci
 
     condition(:protected_ref) { ref_protected?(@user, @subject.project, @subject.tag?, @subject.ref) }
 
+    condition(:branch_allows_maintainer_push) do
+      @subject.project.branch_allows_maintainer_push?(@user, @subject.ref)
+    end
+
     rule { protected_ref }.prevent :update_pipeline
 
+    rule { can?(:public_access) & branch_allows_maintainer_push }.policy do
+      enable :update_pipeline
+    end
+
     def ref_protected?(user, project, tag, ref)
       access = ::Gitlab::UserAccess.new(user, project: project)
 

app/policies/global_policy.rb

 class GlobalPolicy < BasePolicy
   desc "User is blocked"
   with_options scope: :user, score: 0
-  condition(:blocked) { @user.blocked? }
+  condition(:blocked) { @user&.blocked? }
 
   desc "User is an internal user"
   with_options scope: :user, score: 0
-  condition(:internal) { @user.internal? }
+  condition(:internal) { @user&.internal? }
 
   desc "User's access has been locked"
   with_options scope: :user, score: 0
-  condition(:access_locked) { @user.access_locked? }
+  condition(:access_locked) { @user&.access_locked? }
 
-  condition(:can_create_fork, scope: :user) { @user.manageable_namespaces.any? { |namespace| @user.can?(:create_projects, namespace) } }
+  condition(:can_create_fork, scope: :user) { @user && @user.manageable_namespaces.any? { |namespace| @user.can?(:create_projects, namespace) } }
+
+  condition(:required_terms_not_accepted, scope: :user, score: 0) do
+    @user&.required_terms_not_accepted?
+  end
 
   rule { anonymous }.policy do
     prevent :log_in
-    prevent :access_api
-    prevent :access_git
     prevent :receive_notifications
     prevent :use_quick_actions
     prevent :create_group
@@ -38,6 +40,11 @@ class GlobalPolicy < BasePolicy
     prevent :use_quick_actions
   end
 
+  rule { required_terms_not_accepted }.policy do
+    prevent :access_api
+    prevent :access_git
+  end
+
   rule { can_create_group }.policy do
     enable :create_group
   end

app/policies/project_policy.rb

@@ -76,7 +76,7 @@ class ProjectPolicy < BasePolicy
   condition(:request_access_enabled, scope: :subject, score: 0) { project.request_access_enabled }
 
   desc "Has merge requests allowing pushes to user"
-  condition(:has_merge_requests_allowing_pushes, scope: :subject) do
+  condition(:has_merge_requests_allowing_pushes) do
     project.merge_requests_allowing_push_to_user(user).any?
   end
 
@@ -354,9 +354,7 @@ class ProjectPolicy < BasePolicy
   # to run pipelines for the branches they have access to.
   rule { can?(:public_access) & has_merge_requests_allowing_pushes }.policy do
     enable :create_build
-    enable :update_build
     enable :create_pipeline
-    enable :update_pipeline
   end
 
   rule do

app/views/groups/group_members/index.html.haml

 - page_title "Members"
+- can_manage_members = can?(current_user, :admin_group_member, @group)
 
 .project-members-page.prepend-top-default
   %h4
     Members
   %hr
-  - if can?(current_user, :admin_group_member, @group)
+  - if can_manage_members
     .project-members-new.append-bottom-default
       %p.clearfix
         Add new member to
@@ -13,20 +14,23 @@
 
     = render 'shared/members/requests', membership_source: @group, requesters: @requesters
 
-  .append-bottom-default.clearfix
+  .clearfix
     %h5.member.existing-title
       Existing members
-    = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form'  do
-      .form-group
-        = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
-        %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
-          = icon("search")
-        = render 'shared/members/sort_dropdown'
   .panel.panel-default
-    .panel-heading
-      Members with access to
-      %strong= @group.name
+    .panel-heading.flex-project-members-panel
+      %span.flex-project-title
+        Members with access to
+        %strong= @group.name
       %span.badge= @members.total_count
+      = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form'  do
+        .form-group
+          = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
+          %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
+            = icon("search")
+          - if can_manage_members
+            = render 'shared/members/filter_2fa_dropdown'
+          = render 'shared/members/sort_dropdown'
     %ul.content-list.members-list
       = render partial: 'shared/members/member', collection: @members, as: :member
     = paginate @members, theme: 'gitlab'

app/views/groups/issues.html.haml

@@ -8,7 +8,7 @@
   .top-area
     = render 'shared/issuable/nav', type: :issues
     .nav-controls
-      = link_to params.merge(rss_url_options), class: 'btn' do
+      = link_to safe_params.merge(rss_url_options), class: 'btn' do
         = icon('rss')
         %span.icon-label
           Subscribe

app/views/projects/wikis/edit.html.haml

@@ -28,9 +28,16 @@
       = link_to project_wiki_history_path(@project, @page), class: "btn" do
         = s_("Wiki|Page history")
       - if can?(current_user, :admin_wiki, @project)
-        = link_to project_wiki_path(@project, @page), data: { confirm: s_("WikiPageConfirmDelete|Are you sure you want to delete this page?")}, method: :delete, class: "btn btn-danger" do
-          = _("Delete")
+        %button.btn.btn-danger{ data: { toggle: 'modal',
+          target: '#delete-wiki-modal',
+          delete_wiki_url: project_wiki_path(@project, @page),
+          page_title: @page.title.capitalize },
+          id: 'delete-wiki-button',
+          type: 'button' }
+          = _('Delete')
 
 = render 'form'
 
 = render 'sidebar'
+
+#delete-wiki-modal.modal.fade

app/views/shared/members/_filter_2fa_dropdown.html.haml

+- filter = params[:two_factor] || 'everyone'
+- filter_options = { 'everyone' => 'Everyone', 'enabled' => 'Enabled', 'disabled' => 'Disabled' }
+.dropdown.inline.member-filter-2fa-dropdown
+  = dropdown_toggle('2FA: ' + filter_options[filter], { toggle: 'dropdown' })
+  %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable
+    %li.dropdown-header
+      Filter by two-factor authentication
+    - filter_options.each do |value, title|
+      %li
+        = link_to filter_group_project_member_path(two_factor: value), class: ("is-active" if filter == value) do
+          = title

app/views/shared/members/_member.html.haml

@@ -20,6 +20,10 @@
           %label.label.label-danger
             %strong Blocked
 
+        - if user.two_factor_enabled?
+          %label.label.label-info
+            2FA
+
         - if source.instance_of?(Group) && source != @group
           ·
           = link_to source.full_name, source, class: "member-group-link"

bin/secpick

@@ -5,7 +5,6 @@ require 'rainbow/refinement'
 using Rainbow
 
 BRANCH_PREFIX = 'security'.freeze
-STABLE_BRANCH_SUFFIX = 'stable'.freeze
 REMOTE = 'dev'.freeze
 
 options = { version: nil, branch: nil, sha: nil }
@@ -37,9 +36,9 @@ abort("Missing options. Use #{$0} --help to see the list of options available".r
 abort("Wrong version format #{options[:version].bold}".red) unless options[:version] =~ /\A\d*\-\d*\Z/
 
 branch = [BRANCH_PREFIX, options[:branch], options[:version]].join('-').freeze
-stable_branch = "#{options[:version]}-#{STABLE_BRANCH_SUFFIX}".freeze
+stable_branch = "#{BRANCH_PREFIX}-#{options[:version]}".freeze
 
-command = "git checkout #{stable_branch} && git pull #{REMOTE} #{stable_branch} && git checkout -B #{branch} && git cherry-pick #{options[:sha]} && git push #{REMOTE} #{branch}"
+command = "git fetch #{REMOTE} #{stable_branch} && git checkout #{stable_branch} && git pull #{REMOTE} #{stable_branch} && git checkout -B #{branch} && git cherry-pick #{options[:sha]} && git push #{REMOTE} #{branch}"
 
 _stdin, stdout, stderr = Open3.popen3(command)
 

bin/spinach

-#!/usr/bin/env ruby
-
-# Remove this block when removing rails5? code.
-gemfile = %w[1 true].include?(ENV["RAILS5"]) ? "Gemfile.rails5" : "Gemfile"
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__)
-
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
-require 'bundler/setup'
-load Gem.bin_path('spinach', 'spinach')

changelogs/unreleased/45715-remove-modal-retry.yml

+---
+title: Remove modalbox confirmation when retrying a pipeline
+merge_request: 18879
+author:
+type: changed

changelogs/unreleased/46286-fix-ingress-rbac-default-value.yml

+---
+title: Disables RBAC on nginx-ingress
+merge_request: 18947
+author:
+type: fixed

changelogs/unreleased/46345-kubernetes-popover-illustration-skewed.yml

+---
+title: Correct skewed Kubernetes popover illustration
+merge_request: 18949
+author:
+type: fixed

changelogs/unreleased/blackst0ne-remove-spinach.yml

+---
+title: Remove Spinach
+merge_request: 18869
+author: '@blackst0ne'
+type: other

changelogs/unreleased/blackst0ne-replace-spinach-project-forked-merge-requests-feature.yml

+---
+title: 'Replace the `project/forked_merge_requests.feature` spinach test with an rspec analog'
+merge_request: 18867
+author: '@blackst0ne'
+type: other

changelogs/unreleased/blackst0ne-replace-spinach-project-merge-requests-references-feature.yml

+---
+title: 'Replace the `project/merge_requests/references.feature` spinach test with an rspec analog'
+merge_request: 18794
+author: '@blackst0ne'
+type: other

changelogs/unreleased/bvl-restrict-api-git-for-terms.yml

+---
+title: Block access to the API & git for users that did not accept enforced Terms
+  of Service
+merge_request: 18816
+author:
+type: other

changelogs/unreleased/dz-add-2fa-filter.yml

+---
+title: Add 2FA filter to the group members page
+merge_request: 18483
+author:
+type: changed

changelogs/unreleased/jprovazn-pipeline-policy.yml

+---
+title: Allow maintainers to retry pipelines on forked projects (if allowed in merge
+  request)
+merge_request:
+author:
+type: fixed

changelogs/unreleased/refactor-move-squash-before-merge-vue-component.yml

+---
+title: Move SquashBeforeMerge vue component
+merge_request: 18813
+author: George Tsiolis
+type: performance

changelogs/unreleased/sh-fix-blocked-user-account-ldap.yml

+---
+title: Fix system hook not firing for blocked users when LDAP sign-in is used
+merge_request:
+author:
+type: fixed

changelogs/unreleased/sh-fix-cross-site-origin-uploads-js.yml

+---
+title: Fix cross-origin errors when attempting to download JavaScript attachments
+merge_request:
+author:
+type: fixed

changelogs/unreleased/update-wiki-modal.yml

+---
+title: New design for wiki page deletion confirmation
+merge_request: 18712
+author: Constance Okoghenun
+type: added

changelogs/unreleased/zj-wiki-find-file-opt-out.yml

+---
+title: Finding a wiki page is done by Gitaly by default
+merge_request:
+author:
+type: other

config/initializers/deprecations.rb

-deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab')
-
 if Gitlab.dev_env_or_com?
+  deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab')
+
+  deprecator.behavior = -> (message, callstack) {
+    Rails.logger.warn("#{message}: #{callstack[1..20].join}")
+  }
+
   ActiveSupport::Deprecation.deprecate_methods(Gitlab::GitalyClient::StorageSettings, :legacy_disk_path, deprecator: deprecator)
 end

doc/README.md

@@ -241,7 +241,7 @@ GitLab.com is hosted, managed, and administered by GitLab, Inc., with
 and teams: Free, Bronze, Silver, and Gold.
 
 GitLab.com subscriptions grants access
-to the same features available in GitLab self-hosted, **expect
+to the same features available in GitLab self-hosted, **except
 [administration](administration/index.md) tools and settings**:
 
 - GitLab.com Free includes the same features available in Core

doc/api/group_milestones.md

@@ -22,7 +22,7 @@ Parameters:
 | --------- | ---- | -------- | ----------- |
 | `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user |
 | `iids[]` | Array[integer] | optional | Return only the milestones having the given `iid` |
-| `state` | string | optional | Return only `active` or `closed` milestones` |
+| `state` | string | optional | Return only `active` or `closed` milestones |
 | `search` | string | optional | Return only milestones with a title or description matching the provided string |
 
 ```bash

doc/api/jobs.md

@@ -82,7 +82,7 @@ Example of response
     "artifacts_file": null,
     "finished_at": "2015-12-24T17:54:24.921Z",
     "id": 6,
-    "name": "spinach:other",
+    "name": "rspec:other",
     "pipeline": {
       "id": 6,
       "ref": "master",
@@ -196,7 +196,7 @@ Example of response
     "artifacts_file": null,
     "finished_at": "2015-12-24T17:54:24.921Z",
     "id": 6,
-    "name": "spinach:other",
+    "name": "rspec:other",
     "pipeline": {
       "id": 6,
       "ref": "master",

doc/api/services.md

@@ -968,7 +968,7 @@ Group Chat Software
 Set Microsoft Teams service for a project.
 
 ```
-PUT /projects/:id/services/microsoft_teams
+PUT /projects/:id/services/microsoft-teams
 ```
 
 Parameters:
@@ -982,7 +982,7 @@ Parameters:
 Delete Microsoft Teams service for a project.
 
 ```
-DELETE /projects/:id/services/microsoft_teams
+DELETE /projects/:id/services/microsoft-teams
 ```
 
 ### Get Microsoft Teams service settings
@@ -990,7 +990,7 @@ DELETE /projects/:id/services/microsoft_teams
 Get Microsoft Teams service settings for a project.
 
 ```
-GET /projects/:id/services/microsoft_teams
+GET /projects/:id/services/microsoft-teams
 ```
 
 ## Mattermost notifications

doc/development/code_review.md

@@ -29,6 +29,10 @@ There are a few rules to get your merge request accepted:
     to ask one of the [Merge request coaches][team].
   1. The reviewer will assign the merge request to a maintainer once the
     reviewer is satisfied with the state of the merge request.
+1. Keep in mind that maintainers are also going to perform a final code review.
+   The ideal scenario is that the reviewer has already addressed any concerns
+   the maintainer would have found, and the maintainer only has to perform the
+   merge, but be prepared for further review comments.
 
 For more guidance, see [CONTRIBUTING.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md).
 
@@ -207,3 +211,4 @@ Largely based on the [thoughtbot code review guide].
 [projects]: https://about.gitlab.com/handbook/engineering/projects/
 [team]: https://about.gitlab.com/team/
 [build handbook]: https://about.gitlab.com/handbook/build/handbook/build#how-to-work-with-build
+[^1]: Please note that specs other than JavaScript specs are considered backend code.

doc/development/database_debugging.md

@@ -11,7 +11,7 @@ Available `RAILS_ENV`
 
  - `production` (generally not for your main GDK db, but you may need this for e.g. omnibus)
  - `development` (this is your main GDK db)
- - `test` (used for tests like rspec and spinach)
+ - `test` (used for tests like rspec)
 
 
 ## Nuke everything and start over

doc/development/rake_tasks.md

@@ -65,12 +65,11 @@ To make sure that indices still fit. You could find great details in:
 ## Run tests
 
 In order to run the test you can use the following commands:
-- `rake spinach` to run the spinach suite
 - `rake spec` to run the rspec suite
 - `rake karma` to run the karma test suite
 - `rake gitlab:test` to run all the tests
 
-Note: Both `rake spinach` and `rake spec` takes significant time to pass.
+Note: `rake spec` takes significant time to pass.
 Instead of running full test suite locally you can save a lot of time by running
 a single test or directory related to your changes. After you submit merge request
 CI will run full test suite for you. Green CI status in the merge request means
@@ -82,12 +81,10 @@ files it can find, also the ones in `/tmp`
 To run a single test file you can use:
 
 - `bin/rspec spec/controllers/commit_controller_spec.rb` for a rspec test
-- `bin/spinach features/project/issues/milestones.feature` for a spinach test
 
 To run several tests inside one directory:
 
 - `bin/rspec spec/requests/api/` for the rspec tests if you want to test API only
-- `bin/spinach features/profile/` for the spinach tests if you want to test only profile pages
 
 ### Speed-up tests, rake tasks, and migrations
 

doc/development/testing_guide/best_practices.md

@@ -12,8 +12,7 @@ Here are some things to keep in mind regarding test performance:
 - `FactoryBot.build(...)` and `.build_stubbed` are faster than `.create`.
 - Don't `create` an object when `build`, `build_stubbed`, `attributes_for`,
   `spy`, or `double` will do. Database persistence is slow!
-- Don't mark a feature as requiring JavaScript (through `@javascript` in
-  Spinach or `:js` in RSpec) unless it's _actually_ required for the test
+- Don't mark a feature as requiring JavaScript (through `:js` in RSpec) unless it's _actually_ required for the test
   to be valid. Headless browser testing is slow!
 
 [parallelization]: ci.md#test-suite-parallelization-on-the-ci

doc/development/testing_guide/ci.md

@@ -24,8 +24,7 @@ Our current CI parallelization setup is as follows:
   uploaded to S3.
 
 After that, the next pipeline will use the up-to-date
-`knapsack/${CI_PROJECT_NAME}/rspec_report-master.json` file. The same strategy
-is used for Spinach tests as well.
+`knapsack/${CI_PROJECT_NAME}/rspec_report-master.json` file. 
 
 ### Monitoring
 

doc/development/testing_guide/frontend_testing.md

@@ -280,26 +280,6 @@ describe "Admin::AbuseReports", :js do
 end
 ```
 
-### Spinach errors due to missing JavaScript
-
-NOTE: **Note:** Since we are discouraging the use of Spinach when writing new
-feature tests, you shouldn't ever need to use this. This information is kept
-available for legacy purposes only.
-
-In Spinach, the JavaScript driver is enabled differently. In the `*.feature`
-file for the failing spec, add the `@javascript` flag above the Scenario:
-
-```
-@javascript
-Scenario: Developer can approve merge request
-  Given I am a "Shop" developer
-  And I visit project "Shop" merge requests page
-  And merge request 'Bug NS-04' must be approved
-  And I click link "Bug NS-04"
-  When I click link "Approve"
-  Then I should see approved merge request "Bug NS-04"
-```
-
 [jasmine-focus]: https://jasmine.github.io/2.5/focused_specs.html
 [jasmine-jquery]: https://github.com/velesin/jasmine-jquery
 [karma]: http://karma-runner.github.io/

doc/development/testing_guide/index.md

@@ -72,21 +72,6 @@ Everything you should know about how to run end-to-end tests using
 
 ---
 
-## Spinach (feature) tests
-
-GitLab [moved from Cucumber to Spinach](https://github.com/gitlabhq/gitlabhq/pull/1426)
-for its feature/integration tests in September 2012.
-
-As of March 2016, we are [trying to avoid adding new Spinach
-tests](https://gitlab.com/gitlab-org/gitlab-ce/issues/14121) going forward,
-opting for [RSpec feature](#features-integration) specs.
-
-Adding new Spinach scenarios is acceptable _only if_ the new scenario requires
-no more than one new `step` definition. If more than that is required, the
-test should be re-implemented using RSpec instead.
-
----
-
 [Return to Development documentation](../README.md)
 
 [^1]: /ci/yaml/README.html#dependencies

doc/development/testing_guide/testing_levels.md

@@ -81,7 +81,6 @@ possible).
 | Tests path | Testing engine | Notes |
 | ---------- | -------------- | ----- |
 | `spec/features/` | [Capybara] + [RSpec] | If your spec has the `:js` metadata, the browser driver will be [Poltergeist], otherwise it's using [RackTest]. |
-| `features/` | Spinach | Spinach tests are deprecated, [you shouldn't add new Spinach tests](#spinach-feature-tests). |
 
 ### Consider **not** writing a system test!
 

doc/install/kubernetes/gitlab_runner_chart.md

 # GitLab Runner Helm Chart
 > **Note:**
-These charts have been tested on Google Kubernetes Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/charts.gitlab.io/issues).
+These charts have been tested on Google Kubernetes Engine and Azure Container Service. Other Kubernetes installations may work as well, if not please [open an issue](https://gitlab.com/charts/gitlab-runner/issues).
 
 The `gitlab-runner` Helm chart deploys a GitLab Runner instance into your
 Kubernetes cluster.
@@ -25,7 +25,7 @@ For more information on available GitLab Helm Charts, please see our [overview](
 Create a `values.yaml` file for your GitLab Runner configuration. See [Helm docs](https://github.com/kubernetes/helm/blob/master/docs/chart_template_guide/values_files.md)
 for information on how your values file will override the defaults.
 
-The default configuration can always be found in the [values.yaml](https://gitlab.com/charts/charts.gitlab.io/blob/master/charts/gitlab-runner/values.yaml) in the chart repository.
+The default configuration can always be found in the [values.yaml](https://gitlab.com/charts/gitlab-runner/blob/master/values.yaml) in the chart repository.
 
 ### Required configuration
 
@@ -39,7 +39,7 @@ Unless you need to specify additional configuration, you are [ready to install](
 
 ### Other configuration
 
-The rest of the configuration is [documented in the `values.yaml`](https://gitlab.com/charts/charts.gitlab.io/blob/master/charts/gitlab-runner/values.yaml) in the chart repository.
+The rest of the configuration is [documented in the `values.yaml`](https://gitlab.com/charts/gitlab-runner/blob/master/values.yaml) in the chart repository.
 
 Here is a snippet of the important settings:
 

doc/user/project/merge_requests/maintainer_access.md

@@ -16,3 +16,5 @@ source project, and only lasts while the merge request is open.
 Enable this functionality while creating a merge request:
 
 ![Enable maintainer edits](./img/allow_maintainer_push.png)
+
+[ce-17395]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17395

features/project/commits/diff_comments.feature

-@project_commits
-Feature: Project Commits Diff Comments
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    And I visit project commit page
-
-  @javascript
-  Scenario: I can comment on a commit diff
-    Given I leave a diff comment like "Typo, please fix"
-    Then I should see a diff comment saying "Typo, please fix"
-
-  @javascript
-  Scenario: I can add a diff comment with a single emoji
-    Given I open a diff comment form
-    And I write a diff comment like ":smile:"
-    Then I should see a diff comment with an emoji image
-
-  @javascript
-  Scenario: I get a temporary form for the first comment on a diff line
-    Given I open a diff comment form
-    Then I should see a temporary diff comment form
-
-  @javascript
-  Scenario: I have a cancel button on the diff form
-    Given I open a diff comment form
-    Then I should see the cancel comment button
-
-  @javascript
-  Scenario: I can cancel a diff form
-    Given I open a diff comment form
-    And I cancel the diff comment
-    Then I should not see the diff comment form
-
-  @javascript
-  Scenario: I can't open a second form for a diff line
-    Given I open a diff comment form
-    And I open a diff comment form
-    Then I should only see one diff form
-
-  @javascript
-  Scenario: I can have multiple forms
-    Given I open a diff comment form
-    And I write a diff comment like ":-1: I don't like this"
-    And I open another diff comment form
-    Then I should see a diff comment form with ":-1: I don't like this"
-    And I should see an empty diff comment form
-
-  @javascript
-  Scenario: I can preview multiple forms separately
-    Given I preview a diff comment text like "Should fix it :smile:"
-    And I preview another diff comment text like "DRY this up"
-    Then I should see two separate previews
-
-  @javascript
-  Scenario: I have a reply button in discussions
-    Given I leave a diff comment like "Typo, please fix"
-    Then I should see a discussion reply button
-
-  @javascript
-  Scenario: I can preview with text
-    Given I open a diff comment form
-    And I write a diff comment like ":-1: I don't like this"
-    Then The diff comment preview tab should display rendered Markdown
-
-  @javascript
-  Scenario: I preview a diff comment
-    Given I preview a diff comment text like "Should fix it :smile:"
-    Then I should see the diff comment preview
-    And I should not see the diff comment text field
-
-  @javascript
-  Scenario: I can edit after preview
-    Given I preview a diff comment text like "Should fix it :smile:"
-    Then I should see the diff comment write tab
-
-  @javascript
-  Scenario: The form gets removed after posting
-    Given I preview a diff comment text like "Should fix it :smile:"
-    And I submit the diff comment
-    Then I should not see the diff comment form
-    And I should see a discussion reply button
-
-  @javascript
-  Scenario: I can add a comment on a side-by-side commit diff (left side)
-    Given I open a diff comment form
-    And I click side-by-side diff button
-    When I leave a diff comment in a parallel view on the left side like "Old comment"
-    Then I should see a diff comment on the left side saying "Old comment"
-
-  @javascript
-  Scenario: I can add a comment on a side-by-side commit diff (right side)
-    Given I open a diff comment form
-    And I click side-by-side diff button
-    When I leave a diff comment in a parallel view on the right side like "New comment"
-    Then I should see a diff comment on the right side saying "New comment"

features/project/forked_merge_requests.feature

-Feature: Project Forked Merge Requests
-  Background:
-    Given I sign in as a user
-    And I am a member of project "Shop"
-    And I have a project forked off of "Shop" called "Forked Shop"
-
-  @javascript
-  Scenario: I submit new unassigned merge request to a forked project
-    Given I visit project "Forked Shop" merge requests page
-    And I click link "New Merge Request"
-    And I fill out a "Merge Request On Forked Project" merge request
-    And I submit the merge request
-    Then I should see merge request "Merge Request On Forked Project"
-
-  # TODO: Improve it so it does not fail randomly
-  #
-  #@javascript
-  #Scenario: I can edit a forked merge request
-    #Given I visit project "Forked Shop" merge requests page
-    #And I click link "New Merge Request"
-    #And I fill out a "Merge Request On Forked Project" merge request
-    #And I submit the merge request
-    #And I should see merge request "Merge Request On Forked Project"
-    #And I click link edit "Merge Request On Forked Project"
-    #Then I see the edit page prefilled for "Merge Request On Forked Project"
-    #And I update the merge request title
-    #And I save the merge request
-    #Then I should see the edited merge request
-
-  Scenario: I cannot submit an invalid merge request
-    Given I visit project "Forked Shop" merge requests page
-    And I click link "New Merge Request"
-    And I fill out an invalid "Merge Request On Forked Project" merge request
-    Then I should see validation errors
-
-  @javascript
-  Scenario: Merge request should target fork repository by default
-    Given I visit project "Forked Shop" merge requests page
-    And I click link "New Merge Request"
-    Then the target repository should be the original repository
-
-  @javascript
-  Scenario: I see the users in the target project for a new merge request
-    Given I sign in as an admin
-    And I have a project forked off of "Shop" called "Forked Shop"
-    Then I visit project "Forked Shop" merge requests page
-    And I click link "New Merge Request"
-    And I fill out a "Merge Request On Forked Project" merge request
-    When I click "Assign to" dropdown"
-    Then I should see the target project ID in the input selector
-    And I should see the users from the target project ID

features/project/merge_requests/references.feature

-@project_merge_requests
-Feature: Project Merge Requests References
-  Background:
-    Given I sign in as "John Doe"
-    And public project "Community"
-    And "John Doe" owns public project "Community"
-    And project "Community" has "Community fix" open merge request
-    And I logout
-    And I sign in as "Mary Jane"
-    And private project "Enterprise"
-    And "Mary Jane" owns private project "Enterprise"
-    And project "Enterprise" has "Enterprise issue" open issue
-    And project "Enterprise" has "Enterprise fix" open merge request
-    And I visit issue page "Enterprise issue"
-    And I leave a comment referencing issue "Community fix"
-    And I visit merge request page "Enterprise fix"
-    And I leave a comment referencing issue "Community fix"
-    And I logout
-
-  @javascript
-  Scenario: Viewing the public issue as a "John Doe"
-    Given I sign in as "John Doe"
-    When I visit issue page "Community fix"
-    Then I should see no notes at all
-
-  @javascript
-  Scenario: Viewing the public issue as "Mary Jane"
-    Given I sign in as "Mary Jane"
-    When I visit issue page "Community fix"
-    And I should see a note linking to "Enterprise fix" merge request
-    And I should see a note linking to "Enterprise issue" issue

features/steps/group/members.rb

-class Spinach::Features::GroupMembers < Spinach::FeatureSteps
-  include WaitForRequests
-  include SharedAuthentication
-  include SharedPaths
-  include SharedGroup
-  include SharedUser
-
-  step 'I should see user "John Doe" in team list' do
-    expect(group_members_list).to have_content("John Doe")
-  end
-
-  step 'I should not see user "Mary Jane" in team list' do
-    expect(group_members_list).not_to have_content("Mary Jane")
-  end
-
-  step 'I click on the "Remove User From Group" button for "John Doe"' do
-    find(:css, '.project-members-page li', text: "John Doe").find(:css, 'a.btn-remove').click
-    # poltergeist always confirms popups.
-  end
-
-  step 'I click on the "Remove User From Group" button for "Mary Jane"' do
-    find(:css, 'li', text: "Mary Jane").find(:css, 'a.btn-remove').click
-    # poltergeist always confirms popups.
-  end
-
-  step 'I should not see the "Remove User From Group" button for "John Doe"' do
-    expect(find(:css, '.project-members-page li', text: "John Doe")).not_to have_selector(:css, 'a.btn-remove')
-    # poltergeist always confirms popups.
-  end
-
-  step 'I should not see the "Remove User From Group" button for "Mary Jane"' do
-    expect(find(:css, 'li', text: "Mary Jane")).not_to have_selector(:css, 'a.btn-remove')
-    # poltergeist always confirms popups.
-  end
-
-  step 'I change the "Mary Jane" role to "Developer"' do
-    member = mary_jane_member
-
-    page.within "#group_member_#{member.id}" do
-      click_button member.human_access
-
-      page.within '.dropdown-menu' do
-        click_link 'Developer'
-      end
-
-      wait_for_requests
-    end
-  end
-
-  step 'I should see "Mary Jane" as "Developer"' do
-    member = mary_jane_member
-
-    page.within "#group_member_#{member.id}" do
-      expect(page).to have_content "Developer"
-    end
-  end
-
-  private
-
-  def mary_jane_member
-    user = User.find_by(name: "Mary Jane")
-    owned_group.members.find_by(user_id: user.id)
-  end
-
-  def group_members_list
-    find(".panel .content-list")
-  end
-end

features/steps/profile/notifications.rb

-class Spinach::Features::ProfileNotifications < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-
-  step 'I visit profile notifications page' do
-    visit profile_notifications_path
-  end
-
-  step 'I should see global notifications settings' do
-    expect(page).to have_content "Notifications"
-  end
-
-  step 'I select Mention setting from dropdown' do
-    first(:link, "On mention").click
-  end
-
-  step 'I should see Notification saved message' do
-    expect(page).to have_content 'On mention'
-  end
-end

features/steps/project/commits/branches.rb

-class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-  include SharedPaths
-
-  step 'I click link "All"' do
-    click_link "All"
-  end
-
-  step 'I click link "Protected"' do
-    click_link "Protected"
-  end
-
-  step 'I click new branch link' do
-    click_link "New branch"
-  end
-
-  step 'I submit new branch form with invalid name' do
-    fill_in 'branch_name', with: '1.0 stable'
-    page.find("body").click # defocus the branch_name input
-    select_branch('master')
-    click_button 'Create branch'
-  end
-
-  def select_branch(branch_name)
-    find('.git-revision-dropdown-toggle').click
-
-    page.within '#new-branch-form .dropdown-menu' do
-      click_link branch_name
-    end
-  end
-end

features/steps/project/commits/comments.rb

-class Spinach::Features::ProjectCommitsComments < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedNote
-  include SharedPaths
-  include SharedProject
-end

features/steps/project/commits/diff_comments.rb

-class Spinach::Features::ProjectCommitsDiffComments < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedDiffNote
-  include SharedPaths
-  include SharedProject
-end

features/steps/project/create.rb

-class Spinach::Features::ProjectCreate < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include SharedUser
-
-  step 'fill project form with valid data' do
-    fill_in 'project_path', with: 'Empty'
-    page.within '#content-body' do
-      click_button "Create project"
-    end
-  end
-
-  step 'I should see project page' do
-    expect(page).to have_content "Empty"
-    expect(current_path).to eq project_path(Project.last)
-  end
-
-  step 'I should see empty project instructions' do
-    expect(page).to have_content "git init"
-    expect(page).to have_content "git remote"
-    expect(page).to have_content Project.last.url_to_repo
-  end
-end

features/steps/project/forked_merge_requests.rb

-class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-  include SharedNote
-  include SharedPaths
-  include Select2Helper
-  include WaitForRequests
-  include ProjectForksHelper
-
-  step 'I am a member of project "Shop"' do
-    @project = ::Project.find_by(name: "Shop")
-    @project ||= create(:project, :repository, name: "Shop")
-    @project.add_reporter(@user)
-  end
-
-  step 'I have a project forked off of "Shop" called "Forked Shop"' do
-    @forked_project = fork_project(@project, @user,
-                                   namespace: @user.namespace,
-                                   repository: true)
-  end
-
-  step 'I click link "New Merge Request"' do
-    page.within '#content-body' do
-      page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request')
-    end
-  end
-
-  step 'I should see merge request "Merge Request On Forked Project"' do
-    expect(@project.merge_requests.size).to be >= 1
-    @merge_request = @project.merge_requests.last
-    expect(current_path).to eq project_merge_request_path(@project, @merge_request)
-    expect(@merge_request.title).to eq "Merge Request On Forked Project"
-    expect(@merge_request.source_project).to eq @forked_project
-    expect(@merge_request.source_branch).to eq "fix"
-    expect(@merge_request.target_branch).to eq "master"
-    expect(page).to have_content @forked_project.full_path
-    expect(page).to have_content @project.full_path
-    expect(page).to have_content @merge_request.source_branch
-    expect(page).to have_content @merge_request.target_branch
-
-    wait_for_requests
-  end
-
-  step 'I fill out a "Merge Request On Forked Project" merge request' do
-    expect(page).to have_content('Source branch')
-    expect(page).to have_content('Target branch')
-
-    first('.js-source-project').click
-    first('.dropdown-source-project a', text: @forked_project.full_path)
-
-    first('.js-target-project').click
-    first('.dropdown-target-project a', text: @project.full_path)
-
-    first('.js-source-branch').click
-    wait_for_requests
-    first('.js-source-branch-dropdown .dropdown-content a', text: 'fix').click
-
-    click_button "Compare branches and continue"
-
-    expect(page).to have_css("h3.page-title", text: "New Merge Request")
-
-    page.within 'form#new_merge_request' do
-      fill_in "merge_request_title", with: "Merge Request On Forked Project"
-    end
-  end
-
-  step 'I submit the merge request' do
-    click_button "Submit merge request"
-  end
-
-  step 'I update the merge request title' do
-    fill_in "merge_request_title", with: "An Edited Forked Merge Request"
-  end
-
-  step 'I save the merge request' do
-    click_button "Save changes"
-  end
-
-  step 'I should see the edited merge request' do
-    expect(page).to have_content "An Edited Forked Merge Request"
-    expect(@project.merge_requests.size).to be >= 1
-    @merge_request = @project.merge_requests.last
-    expect(current_path).to eq project_merge_request_path(@project, @merge_request)
-    expect(@merge_request.source_project).to eq @forked_project
-    expect(@merge_request.source_branch).to eq "fix"
-    expect(@merge_request.target_branch).to eq "master"
-    expect(page).to have_content @forked_project.full_path
-    expect(page).to have_content @project.full_path
-    expect(page).to have_content @merge_request.source_branch
-    expect(page).to have_content @merge_request.target_branch
-  end
-
-  step 'I should see last push widget' do
-    expect(page).to have_content "You pushed to new_design"
-    expect(page).to have_link "Create Merge Request"
-  end
-
-  step 'I click link edit "Merge Request On Forked Project"' do
-    find("#edit_merge_request").click
-  end
-
-  step 'I see the edit page prefilled for "Merge Request On Forked Project"' do
-    expect(current_path).to eq edit_project_merge_request_path(@project, @merge_request)
-    expect(page).to have_content "Edit merge request #{@merge_request.to_reference}"
-    expect(find("#merge_request_title").value).to eq "Merge Request On Forked Project"
-  end
-
-  step 'I fill out an invalid "Merge Request On Forked Project" merge request' do
-    expect(find_by_id("merge_request_source_project_id", visible: false).value).to eq @forked_project.id.to_s
-    expect(find_by_id("merge_request_target_project_id", visible: false).value).to eq @project.id.to_s
-    expect(find_by_id("merge_request_source_branch", visible: false).value).to eq nil
-    expect(find_by_id("merge_request_target_branch", visible: false).value).to eq "master"
-    click_button "Compare branches"
-  end
-
-  step 'I should see validation errors' do
-    expect(page).to have_content "You must select source and target branch"
-  end
-
-  step 'the target repository should be the original repository' do
-    expect(find_by_id("merge_request_target_project_id").value).to eq "#{@project.id}"
-  end
-
-  step 'I click "Assign to" dropdown"' do
-    click_button 'Assignee'
-  end
-
-  step 'I should see the target project ID in the input selector' do
-    expect(find('.js-assignee-search')["data-project-id"]).to eq "#{@project.id}"
-  end
-
-  step 'I should see the users from the target project ID' do
-    page.within '.dropdown-menu-user' do
-      expect(page).to have_content 'Unassigned'
-      expect(page).to have_content current_user.name
-      expect(page).to have_content @project.users.first.name
-    end
-  end
-end

features/steps/project/issues/filter_labels.rb

-class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-  include SharedPaths
-  include Select2Helper
-
-  step 'I should see "Bugfix1" in issues list' do
-    page.within ".issues-list" do
-      expect(page).to have_content "Bugfix1"
-    end
-  end
-
-  step 'I should see "Bugfix2" in issues list' do
-    page.within ".issues-list" do
-      expect(page).to have_content "Bugfix2"
-    end
-  end
-
-  step 'I should not see "Bugfix2" in issues list' do
-    page.within ".issues-list" do
-      expect(page).not_to have_content "Bugfix2"
-    end
-  end
-
-  step 'I should not see "Feature1" in issues list' do
-    page.within ".issues-list" do
-      expect(page).not_to have_content "Feature1"
-    end
-  end
-
-  step 'I click "dropdown close button"' do
-    page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
-    sleep 2
-  end
-
-  step 'I click link "feature"' do
-    page.within ".labels-filter" do
-      click_link "feature"
-    end
-  end
-
-  step 'project "Shop" has issue "Bugfix1" with labels: "bug", "feature"' do
-    project = Project.find_by(name: "Shop")
-    issue = create(:issue, title: "Bugfix1", project: project)
-    issue.labels << project.labels.find_by(title: 'bug')
-    issue.labels << project.labels.find_by(title: 'feature')
-  end
-
-  step 'project "Shop" has issue "Bugfix2" with labels: "bug", "enhancement"' do
-    project = Project.find_by(name: "Shop")
-    issue = create(:issue, title: "Bugfix2", project: project)
-    issue.labels << project.labels.find_by(title: 'bug')
-    issue.labels << project.labels.find_by(title: 'enhancement')
-  end
-
-  step 'project "Shop" has issue "Feature1" with labels: "feature"' do
-    project = Project.find_by(name: "Shop")
-    issue = create(:issue, title: "Feature1", project: project)
-    issue.labels << project.labels.find_by(title: 'feature')
-  end
-end

features/steps/project/issues/issues.rb

-class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedIssuable
-  include SharedProject
-  include SharedNote
-  include SharedPaths
-  include SharedMarkdown
-  include SharedUser
-
-  step 'I should not see "Release 0.3" in issues' do
-    expect(page).not_to have_content "Release 0.3"
-  end
-
-  step 'I click link "Closed"' do
-    find('.issues-state-filters [data-state="closed"] span', text: 'Closed').click
-  end
-
-  step 'I should see "Release 0.3" in issues' do
-    expect(page).to have_content "Release 0.3"
-  end
-
-  step 'I should not see "Release 0.4" in issues' do
-    expect(page).not_to have_content "Release 0.4"
-  end
-
-  step 'I click link "All"' do
-    find('.issues-state-filters [data-state="all"] span', text: 'All').click
-    # Waits for load
-    expect(find('.issues-state-filters > .active')).to have_content 'All'
-  end
-
-  step 'I should see issue "Tweet control"' do
-    expect(page).to have_content "Tweet control"
-  end
-
-  step 'I click "author" dropdown' do
-    page.find('.js-author-search').click
-    sleep 1
-  end
-
-  step 'I see current user as the first user' do
-    expect(page).to have_selector('.dropdown-content', visible: true)
-    users = page.all('.dropdown-menu-author .dropdown-content li a')
-    expect(users[0].text).to eq 'Any Author'
-    expect(users[1].text).to eq "#{current_user.name} #{current_user.to_reference}"
-  end
-
-  step 'I click link "500 error on profile"' do
-    click_link "500 error on profile"
-  end
-
-  step 'I should see label \'bug\' with issue' do
-    page.within '.issuable-show-labels' do
-      expect(page).to have_content 'bug'
-    end
-  end
-
-  step 'I fill in issue search with "Re"' do
-    filter_issue "Re"
-  end
-
-  step 'I fill in issue search with "Bu"' do
-    filter_issue "Bu"
-  end
-
-  step 'I fill in issue search with ".3"' do
-    filter_issue ".3"
-  end
-
-  step 'I fill in issue search with "Something"' do
-    filter_issue "Something"
-  end
-
-  step 'I fill in issue search with ""' do
-    filter_issue ""
-  end
-
-  step 'project "Shop" has milestone "v2.2"' do
-    milestone = create(:milestone, title: "v2.2", project: project)
-
-    3.times { create(:issue, project: project, milestone: milestone) }
-  end
-
-  step 'project "Shop" has milestone "v3.0"' do
-    milestone = create(:milestone, title: "v3.0", project: project)
-
-    3.times { create(:issue, project: project, milestone: milestone) }
-  end
-
-  When 'I select milestone "v3.0"' do
-    select "v3.0", from: "milestone_id"
-  end
-
-  step 'I should see selected milestone with title "v3.0"' do
-    issues_milestone_selector = "#issue_milestone_id_chzn > a"
-    expect(find(issues_milestone_selector)).to have_content("v3.0")
-  end
-
-  When 'I select first assignee from "Shop" project' do
-    first_assignee = project.users.first
-    select first_assignee.name, from: "assignee_id"
-  end
-
-  step 'I should see first assignee from "Shop" as selected assignee' do
-    issues_assignee_selector = "#issue_assignee_id_chzn > a"
-
-    assignee_name = project.users.first.name
-    expect(find(issues_assignee_selector)).to have_content(assignee_name)
-  end
-
-  step 'The list should be sorted by "Least popular"' do
-    page.within '.issues-list' do
-      page.within 'li.issue:nth-child(1)' do
-        expect(page).to have_content 'Tweet control'
-        expect(page).to have_content '1 2'
-      end
-
-      page.within 'li.issue:nth-child(2)' do
-        expect(page).to have_content 'Release 0.4'
-        expect(page).to have_content '2 1'
-      end
-
-      page.within 'li.issue:nth-child(3)' do
-        expect(page).to have_content 'Bugfix'
-        expect(page).not_to have_content '0 0'
-      end
-    end
-  end
-
-  When 'I visit empty project page' do
-    project = Project.find_by(name: 'Empty Project')
-    visit project_path(project)
-  end
-
-  When "I visit project \"Community\" issues page" do
-    project = Project.find_by(name: 'Community')
-    visit project_issues_path(project)
-  end
-
-  step 'project \'Shop\' has issue \'Bugfix1\' with description: \'Description for issue1\'' do
-    create(:issue, title: 'Bugfix1', description: 'Description for issue1', project: project)
-  end
-
-  step 'project \'Shop\' has issue \'Feature1\' with description: \'Feature submitted for issue1\'' do
-    create(:issue, title: 'Feature1', description: 'Feature submitted for issue1', project: project)
-  end
-
-  step 'I fill in issue search with \'Description for issue1\'' do
-    filter_issue 'Description for issue'
-  end
-
-  step 'I fill in issue search with \'issue1\'' do
-    filter_issue 'issue1'
-  end
-
-  step 'I fill in issue search with \'Rock and roll\'' do
-    filter_issue 'Rock and roll'
-  end
-
-  step 'I should see \'Bugfix1\' in issues' do
-    expect(page).to have_content 'Bugfix1'
-  end
-
-  step 'I should see \'Feature1\' in issues' do
-    expect(page).to have_content 'Feature1'
-  end
-
-  step 'I should not see \'Bugfix1\' in issues' do
-    expect(page).not_to have_content 'Bugfix1'
-  end
-
-  def filter_issue(text)
-    fill_in 'issuable_search', with: text
-  end
-end

features/steps/project/issues/milestones.rb

-class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedProject
-  include SharedPaths
-  include SharedMarkdown
-
-  step 'project "Shop" has milestone "v2.2"' do
-    project = Project.find_by(name: "Shop")
-    milestone = create(:milestone,
-                       title: "v2.2",
-                       project: project,
-                       description: "# Description header"
-                      )
-    3.times { create(:issue, project: project, milestone: milestone) }
-  end
-
-  When 'I click link "All Issues"' do
-    click_link 'All Issues'
-  end
-end

features/steps/project/issues/references.rb

-class Spinach::Features::ProjectIssuesReferences < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedIssuable
-  include SharedNote
-  include SharedProject
-  include SharedUser
-end

features/steps/project/merge_requests/references.rb

-class Spinach::Features::ProjectMergeRequestsReferences < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedIssuable
-  include SharedNote
-  include SharedProject
-  include SharedUser
-end

features/steps/shared/active_tab.rb

-module SharedActiveTab
-  include Spinach::DSL
-  include WaitForRequests
-
-  after do
-    wait_for_requests if javascript_test?
-  end
-
-  def ensure_active_main_tab(content)
-    expect(find('.sidebar-top-level-items > li.active')).to have_content(content)
-  end
-
-  def ensure_active_sub_tab(content)
-    expect(find('.sidebar-sub-level-items > li.active:not(.fly-out-top-item)')).to have_content(content)
-  end
-
-  def ensure_active_sub_nav(content)
-    expect(find('.layout-nav .controls li.active')).to have_content(content)
-  end
-
-  step 'no other main tabs should be active' do
-    expect(page).to have_selector('.sidebar-top-level-items > li.active', count: 1)
-  end
-
-  step 'no other sub tabs should be active' do
-    expect(page).to have_selector('.sidebar-sub-level-items  > li.active:not(.fly-out-top-item)', count: 1)
-  end
-
-  step 'no other sub navs should be active' do
-    expect(page).to have_selector('.layout-nav .controls li.active', count: 1)
-  end
-end

features/steps/shared/admin.rb

-module SharedAdmin
-  include Spinach::DSL
-
-  step 'there are projects in system' do
-    2.times { create(:project, :repository) }
-  end
-
-  step 'system has users' do
-    2.times { create(:user) }
-  end
-end

features/steps/shared/authentication.rb

-require Rails.root.join('features', 'support', 'login_helpers')
-
-module SharedAuthentication
-  include Spinach::DSL
-  include LoginHelpers
-
-  step 'I sign in as a user' do
-    sign_out(@user) if @user
-
-    @user = create(:user)
-    sign_in(@user)
-  end
-
-  step 'I sign in via the UI' do
-    gitlab_sign_in(create(:user))
-  end
-
-  step 'I sign in as an admin' do
-    sign_out(@user) if @user
-
-    @user = create(:admin)
-    sign_in(@user)
-  end
-
-  step 'I sign in as "John Doe"' do
-    gitlab_sign_in(user_exists("John Doe"))
-  end
-
-  step 'I sign in as "Mary Jane"' do
-    gitlab_sign_in(user_exists("Mary Jane"))
-  end
-
-  step 'I should be redirected to sign in page' do
-    expect(current_path).to eq new_user_session_path
-  end
-
-  step "I logout" do
-    gitlab_sign_out
-  end
-
-  step "I logout directly" do
-    gitlab_sign_out
-  end
-
-  def current_user
-    @user || User.reorder(nil).first
-  end
-
-  private
-
-  def gitlab_sign_in(user)
-    visit new_user_session_path
-
-    fill_in "user_login", with: user.email
-    fill_in "user_password", with: "12345678"
-    check 'user_remember_me'
-    click_button "Sign in"
-
-    @user = user
-  end
-
-  def gitlab_sign_out
-    return unless @user
-
-    if Capybara.current_driver == Capybara.javascript_driver
-      find('.header-user-dropdown-toggle').click
-      click_link 'Sign out'
-      expect(page).to have_button('Sign in')
-    else
-      sign_out(@user)
-    end
-
-    @user = nil
-  end
-end

features/steps/shared/diff_note.rb

-module SharedDiffNote
-  include Spinach::DSL
-  include RepoHelpers
-  include WaitForRequests
-
-  after do
-    wait_for_requests if javascript_test?
-  end
-
-  step 'I cancel the diff comment' do
-    page.within(diff_file_selector) do
-      find(".js-close-discussion-note-form").click
-    end
-  end
-
-  step 'I delete a diff comment' do
-    find('.note').hover
-    find(".js-note-delete").click
-  end
-
-  step 'I haven\'t written any diff comment text' do
-    page.within(diff_file_selector) do
-      fill_in "note[note]", with: ""
-    end
-  end
-
-  step 'I leave a diff comment like "Typo, please fix"' do
-    page.within(diff_file_selector) do
-      click_diff_line(sample_commit.line_code)
-
-      page.within("form[data-line-code='#{sample_commit.line_code}']") do
-        fill_in "note[note]", with: "Typo, please fix"
-        find(".js-comment-button").click
-      end
-    end
-  end
-
-  step 'I leave a diff comment in a parallel view on the left side like "Old comment"' do
-    click_parallel_diff_line(sample_commit.del_line_code, 'old')
-    page.within("#{diff_file_selector} form[data-line-code='#{sample_commit.del_line_code}']") do
-      fill_in "note[note]", with: "Old comment"
-      find(".js-comment-button").click
-    end
-  end
-
-  step 'I leave a diff comment in a parallel view on the right side like "New comment"' do
-    click_parallel_diff_line(sample_commit.line_code, 'new')
-    page.within("#{diff_file_selector} form[data-line-code='#{sample_commit.line_code}']") do
-      fill_in "note[note]", with: "New comment"
-      find(".js-comment-button").click
-    end
-  end
-
-  step 'I preview a diff comment text like "Should fix it :smile:"' do
-    page.within(diff_file_selector) do
-      click_diff_line(sample_commit.line_code)
-
-      page.within("form[data-line-code='#{sample_commit.line_code}']") do
-        fill_in "note[note]", with: "Should fix it :smile:"
-        find('.js-md-preview-button').click
-      end
-    end
-  end
-
-  step 'I preview another diff comment text like "DRY this up"' do
-    page.within(diff_file_selector) do
-      click_diff_line(sample_commit.del_line_code)
-
-      page.within("form[data-line-code='#{sample_commit.del_line_code}']") do
-        fill_in "note[note]", with: "DRY this up"
-        find('.js-md-preview-button').click
-      end
-    end
-  end
-
-  step 'I open a diff comment form' do
-    page.within(diff_file_selector) do
-      click_diff_line(sample_commit.line_code)
-    end
-  end
-
-  step 'I open another diff comment form' do
-    page.within(diff_file_selector) do
-      click_diff_line(sample_commit.del_line_code)
-    end
-  end
-
-  step 'I write a diff comment like ":-1: I don\'t like this"' do
-    page.within(diff_file_selector) do
-      fill_in "note[note]", with: ":-1: I don\'t like this"
-    end
-  end
-
-  step 'I write a diff comment like ":smile:"' do
-    page.within(diff_file_selector) do
-      click_diff_line(sample_commit.line_code)
-
-      page.within("form[data-line-code='#{sample_commit.line_code}']") do
-        fill_in 'note[note]', with: ':smile:'
-        click_button('Comment')
-      end
-    end
-  end
-
-  step 'I submit the diff comment' do
-    page.within(diff_file_selector) do
-      click_button("Comment")
-    end
-  end
-
-  step 'I should not see the diff comment form' do
-    page.within(diff_file_selector) do
-      expect(page).not_to have_css("form.new_note")
-    end
-  end
-
-  step 'The diff comment preview tab should say there is nothing to do' do
-    page.within(diff_file_selector) do
-      find('.js-md-preview-button').click
-      expect(find('.js-md-preview')).to have_content('Nothing to preview.')
-    end
-  end
-
-  step 'I should not see the diff comment text field' do
-    page.within(diff_file_selector) do
-      expect(find('.js-note-text')).not_to be_visible
-    end
-  end
-
-  step 'I should only see one diff form' do
-    page.within(diff_file_selector) do
-      expect(page).to have_css("form.new-note", count: 1)
-    end
-  end
-
-  step 'I should see a diff comment form with ":-1: I don\'t like this"' do
-    page.within(diff_file_selector) do
-      expect(page).to have_field("note[note]", with: ":-1: I don\'t like this")
-    end
-  end
-
-  step 'I should see a diff comment saying "Typo, please fix"' do
-    page.within("#{diff_file_selector} .note") do
-      expect(page).to have_content("Typo, please fix")
-    end
-  end
-
-  step 'I should see a diff comment on the left side saying "Old comment"' do
-    page.within("#{diff_file_selector} .notes_content.parallel.old") do
-      expect(page).to have_content("Old comment")
-    end
-  end
-
-  step 'I should see a diff comment on the right side saying "New comment"' do
-    page.within("#{diff_file_selector} .notes_content.parallel.new") do
-      expect(page).to have_content("New comment")
-    end
-  end
-
-  step 'I should see a discussion reply button' do
-    page.within(diff_file_selector) do
-      expect(page).to have_button('Reply...')
-    end
-  end
-
-  step 'I should see a temporary diff comment form' do
-    page.within(diff_file_selector) do
-      expect(page).to have_css(".js-temp-notes-holder form.new-note")
-    end
-  end
-
-  step 'I should see an empty diff comment form' do
-    page.within(diff_file_selector) do
-      expect(page).to have_field("note[note]", with: "")
-    end
-  end
-
-  step 'I should see the cancel comment button' do
-    page.within("#{diff_file_selector} form") do
-      expect(page).to have_css(".js-close-discussion-note-form", text: "Cancel")
-    end
-  end
-
-  step 'I should see the diff comment preview' do
-    page.within("#{diff_file_selector} form") do
-      expect(page).to have_css('.js-md-preview', visible: true)
-    end
-  end
-
-  step 'I should see the diff comment write tab' do
-    page.within(diff_file_selector) do
-      expect(page).to have_css('.js-md-write-button', visible: true)
-    end
-  end
-
-  step 'The diff comment preview tab should display rendered Markdown' do
-    page.within(diff_file_selector) do
-      find('.js-md-preview-button').click
-      expect(find('.js-md-preview')).to have_css('gl-emoji', visible: true)
-    end
-  end
-
-  step 'I should see two separate previews' do
-    page.within(diff_file_selector) do
-      expect(page).to have_css('.js-md-preview', visible: true, count: 2)
-      expect(page).to have_content('Should fix it')
-      expect(page).to have_content('DRY this up')
-    end
-  end
-
-  step 'I should see a diff comment with an emoji image' do
-    page.within("#{diff_file_selector} .note") do
-      expect(page).to have_xpath("//gl-emoji[@data-name='smile']")
-    end
-  end
-
-  step 'I click side-by-side diff button' do
-    find('#parallel-diff-btn').click
-  end
-
-  step 'I see side-by-side diff button' do
-    expect(page).to have_content "Side-by-side"
-  end
-
-  def diff_file_selector
-    '.diff-file:nth-of-type(1)'
-  end
-
-  def click_diff_line(code)
-    find(".line_holder[id='#{code}'] button").click
-  end
-
-  def click_parallel_diff_line(code, line_type)
-    find(".line_holder.parallel td[id='#{code}']").find(:xpath, 'preceding-sibling::*[1][self::td]').hover
-    find(".line_holder.parallel button[data-line-code='#{code}']").click
-  end
-end

features/steps/shared/group.rb

-module SharedGroup
-  include Spinach::DSL
-
-  step 'current user is developer of group "Owned"' do
-    is_member_of(current_user.name, "Owned", Gitlab::Access::DEVELOPER)
-  end
-
-  step '"John Doe" is guest of group "Guest"' do
-    is_member_of("John Doe", "Guest", Gitlab::Access::GUEST)
-  end
-
-  step '"Mary Jane" is owner of group "Owned"' do
-    is_member_of("Mary Jane", "Owned", Gitlab::Access::OWNER)
-  end
-
-  step '"Mary Jane" is guest of group "Owned"' do
-    is_member_of("Mary Jane", "Owned", Gitlab::Access::GUEST)
-  end
-
-  step '"Mary Jane" is guest of group "Guest"' do
-    is_member_of("Mary Jane", "Guest", Gitlab::Access::GUEST)
-  end
-
-  step 'I should see group "TestGroup"' do
-    expect(page).to have_content "TestGroup"
-  end
-
-  step 'I should not see group "TestGroup"' do
-    expect(page).not_to have_content "TestGroup"
-  end
-
-  protected
-
-  def is_member_of(username, groupname, role)
-    user = User.find_by(name: username) || create(:user, name: username)
-    group = Group.find_by(name: groupname) || create(:group, name: groupname)
-    group.add_user(user, role)
-    project ||= create(:project, :repository, namespace: group)
-    create(:closed_issue_event, project: project)
-    project.add_master(user)
-  end
-
-  def owned_group
-    @owned_group ||= Group.find_by(name: "Owned")
-  end
-end

features/steps/shared/issuable.rb

-module SharedIssuable
-  include Spinach::DSL
-
-  def edit_issuable
-    find('.js-issuable-edit', visible: true).click
-  end
-
-  step 'project "Community" has "Community fix" open merge request' do
-    create_issuable_for_project(
-      project_name: 'Community',
-      type: :merge_request,
-      title: 'Community fix'
-    )
-  end
-
-  step 'project "Enterprise" has "Enterprise issue" open issue' do
-    create_issuable_for_project(
-      project_name: 'Enterprise',
-      title: 'Enterprise issue'
-    )
-  end
-
-  step 'project "Enterprise" has "Enterprise fix" open merge request' do
-    create_issuable_for_project(
-      project_name: 'Enterprise',
-      type: :merge_request,
-      title: 'Enterprise fix'
-    )
-  end
-
-  step 'I leave a comment referencing issue "Community issue"' do
-    leave_reference_comment(
-      issuable: Issue.find_by(title: 'Community issue'),
-      from_project_name: 'Enterprise'
-    )
-  end
-
-  step 'I leave a comment referencing issue "Community fix"' do
-    leave_reference_comment(
-      issuable: MergeRequest.find_by(title: 'Community fix'),
-      from_project_name: 'Enterprise'
-    )
-  end
-
-  step 'I visit issue page "Enterprise issue"' do
-    issue = Issue.find_by(title: 'Enterprise issue')
-    visit project_issue_path(issue.project, issue)
-  end
-
-  step 'I visit merge request page "Enterprise fix"' do
-    mr = MergeRequest.find_by(title: 'Enterprise fix')
-    visit project_merge_request_path(mr.target_project, mr)
-  end
-
-  step 'I visit issue page "Community fix"' do
-    mr = MergeRequest.find_by(title: 'Community fix')
-    visit project_merge_request_path(mr.target_project, mr)
-  end
-
-  step 'I should see a note linking to "Enterprise fix" merge request' do
-    visible_note(
-      issuable: MergeRequest.find_by(title: 'Enterprise fix'),
-      from_project_name: 'Community',
-      user_name: 'Mary Jane'
-    )
-  end
-
-  step 'I should see a note linking to "Enterprise issue" issue' do
-    visible_note(
-      issuable: Issue.find_by(title: 'Enterprise issue'),
-      from_project_name: 'Community',
-      user_name: 'Mary Jane'
-    )
-  end
-
-  step 'I click link "Edit" for the merge request' do
-    edit_issuable
-  end
-
-  step 'I sort the list by "Least popular"' do
-    find('button.dropdown-toggle').click
-
-    page.within('.content ul.dropdown-menu.dropdown-menu-align-right li') do
-      click_link 'Least popular'
-    end
-  end
-
-  step 'I click link "Next" in the sidebar' do
-    page.within '.issuable-sidebar' do
-      click_link 'Next'
-    end
-  end
-
-  def create_issuable_for_project(project_name:, title:, type: :issue)
-    project = Project.find_by(name: project_name)
-
-    attrs = {
-      title: title,
-      author: project.users.first,
-      description: '# Description header'
-    }
-
-    case type
-    when :issue
-      attrs[:project] = project
-    when :merge_request
-      attrs.merge!(
-        source_project: project,
-        target_project: project,
-        source_branch: 'fix',
-        target_branch: 'master'
-      )
-    end
-
-    create(type, attrs)
-  end
-
-  def leave_reference_comment(issuable:, from_project_name:)
-    project = Project.find_by(name: from_project_name)
-
-    page.within('.js-main-target-form') do
-      fill_in 'note[note]', with: "##{issuable.to_reference(project)}"
-      click_button 'Comment'
-    end
-  end
-
-  def visible_note(issuable:, from_project_name:, user_name:)
-    project = Project.find_by(name: from_project_name)
-
-    expect(page).to have_content(user_name)
-    expect(page).to have_content("mentioned in #{issuable.class.to_s.titleize.downcase} #{issuable.to_reference(project)}")
-  end
-
-  def expect_sidebar_content(content)
-    page.within '.issuable-sidebar' do
-      expect(page).to have_content content
-    end
-  end
-end

features/steps/shared/markdown.rb

-module SharedMarkdown
-  include Spinach::DSL
-
-  step 'I should not see the Markdown preview' do
-    expect(find('.gfm-form .js-md-preview')).not_to be_visible
-  end
-
-  step 'I haven\'t written any description text' do
-    find('.gfm-form').fill_in 'Description', with: ''
-  end
-end

features/steps/shared/note.rb

-module SharedNote
-  include Spinach::DSL
-  include WaitForRequests
-
-  after do
-    wait_for_requests if javascript_test?
-  end
-
-  step 'I haven\'t written any comment text' do
-    page.within(".js-main-target-form") do
-      fill_in "note[note]", with: ""
-    end
-  end
-
-  step 'The comment preview tab should say there is nothing to do' do
-    page.within(".js-main-target-form") do
-      find('.js-md-preview-button').click
-      expect(find('.js-md-preview')).to have_content('Nothing to preview.')
-    end
-  end
-
-  step 'I should see no notes at all' do
-    expect(page).not_to have_css('.note')
-  end
-end

features/steps/shared/project.rb

-module SharedProject
-  include Spinach::DSL
-
-  # Create a project without caring about what it's called
-  step "I own a project" do
-    @project = create(:project, :repository, namespace: @user.namespace)
-    @project.add_master(@user)
-  end
-
-  step "I own a project in some group namespace" do
-    @group = create(:group, name: 'some group')
-    @project = create(:project, namespace: @group)
-    @project.add_master(@user)
-  end
-
-  # Create a specific project called "Shop"
-  step 'I own project "Shop"' do
-    @project = Project.find_by(name: "Shop")
-    @project ||= create(:project, :repository, name: "Shop", namespace: @user.namespace)
-    @project.add_master(@user)
-  end
-
-  def current_project
-    @project ||= Project.first
-  end
-
-  # ----------------------------------------
-  # Visibility of archived project
-  # ----------------------------------------
-
-  step 'I should not see project "Archive"' do
-    project = Project.find_by(name: "Archive")
-    expect(page).not_to have_content project.full_name
-  end
-
-  step 'I should see project "Archive"' do
-    project = Project.find_by(name: "Archive")
-    expect(page).to have_content project.full_name
-  end
-
-  # ----------------------------------------
-  # Visibility level
-  # ----------------------------------------
-
-  step 'private project "Enterprise"' do
-    create(:project, :private, :repository, name: 'Enterprise')
-  end
-
-  step 'I should see project "Enterprise"' do
-    expect(page).to have_content "Enterprise"
-  end
-
-  step 'I should not see project "Enterprise"' do
-    expect(page).not_to have_content "Enterprise"
-  end
-
-  step 'internal project "Internal"' do
-    create(:project, :internal, :repository, name: 'Internal')
-  end
-
-  step 'I should see project "Internal"' do
-    page.within '.js-projects-list-holder' do
-      expect(page).to have_content "Internal"
-    end
-  end
-
-  step 'I should not see project "Internal"' do
-    page.within '.js-projects-list-holder' do
-      expect(page).not_to have_content "Internal"
-    end
-  end
-
-  step 'public project "Community"' do
-    create(:project, :public, :repository, name: 'Community')
-  end
-
-  step 'I should see project "Community"' do
-    expect(page).to have_content "Community"
-  end
-
-  step 'I should not see project "Community"' do
-    expect(page).not_to have_content "Community"
-  end
-
-  step '"John Doe" owns private project "Enterprise"' do
-    user_owns_project(
-      user_name: 'John Doe',
-      project_name: 'Enterprise'
-    )
-  end
-
-  step '"Mary Jane" owns private project "Enterprise"' do
-    user_owns_project(
-      user_name: 'Mary Jane',
-      project_name: 'Enterprise'
-    )
-  end
-
-  step '"John Doe" owns internal project "Internal"' do
-    user_owns_project(
-      user_name: 'John Doe',
-      project_name: 'Internal',
-      visibility: :internal
-    )
-  end
-
-  step '"John Doe" owns public project "Community"' do
-    user_owns_project(
-      user_name: 'John Doe',
-      project_name: 'Community',
-      visibility: :public
-    )
-  end
-
-  step 'public empty project "Empty Public Project"' do
-    create :project_empty_repo, :public, name: "Empty Public Project"
-  end
-
-  step 'project "Shop" has labels: "bug", "feature", "enhancement"' do
-    project = Project.find_by(name: "Shop")
-    create(:label, project: project, title: 'bug')
-    create(:label, project: project, title: 'feature')
-    create(:label, project: project, title: 'enhancement')
-  end
-
-  def user_owns_project(user_name:, project_name:, visibility: :private)
-    user = user_exists(user_name, username: user_name.gsub(/\s/, '').underscore)
-    project = Project.find_by(name: project_name)
-    project ||= create(:project, visibility, name: project_name, namespace: user.namespace)
-    project.add_master(user)
-  end
-end

features/steps/shared/project_tab.rb

-require_relative 'active_tab'
-
-module SharedProjectTab
-  include Spinach::DSL
-  include SharedActiveTab
-
-  step 'the active main tab should be Project' do
-    ensure_active_main_tab('Overview')
-  end
-
-  step 'the active main tab should be Repository' do
-    ensure_active_main_tab('Repository')
-  end
-
-  step 'the active main tab should be Issues' do
-    ensure_active_main_tab('Issues')
-  end
-
-  step 'the active sub tab should be Members' do
-    ensure_active_sub_tab('Members')
-  end
-
-  step 'the active main tab should be Merge Requests' do
-    ensure_active_main_tab('Merge Requests')
-  end
-
-  step 'the active main tab should be Snippets' do
-    ensure_active_main_tab('Snippets')
-  end
-
-  step 'the active main tab should be Wiki' do
-    ensure_active_main_tab('Wiki')
-  end
-
-  step 'the active main tab should be Members' do
-    ensure_active_main_tab('Members')
-  end
-
-  step 'the active main tab should be Settings' do
-    ensure_active_main_tab('Settings')
-  end
-
-  step 'the active sub tab should be Graph' do
-    ensure_active_sub_tab('Graph')
-  end
-
-  step 'the active sub tab should be Files' do
-    ensure_active_sub_tab('Files')
-  end
-
-  step 'the active sub tab should be Commits' do
-    ensure_active_sub_tab('Commits')
-  end
-
-  step 'the active sub tab should be Home' do
-    ensure_active_sub_tab('Details')
-  end
-
-  step 'the active sub tab should be Activity' do
-    ensure_active_sub_tab('Activity')
-  end
-
-  step 'the active sub tab should be Charts' do
-    ensure_active_sub_tab('Charts')
-  end
-end

features/steps/shared/shortcuts.rb

-module SharedShortcuts
-  include Spinach::DSL
-
-  step 'I press "g" and "p"' do
-    find('body').native.send_key('g')
-    find('body').native.send_key('p')
-  end
-
-  step 'I press "g" and "i"' do
-    find('body').native.send_key('g')
-    find('body').native.send_key('i')
-  end
-
-  step 'I press "g" and "m"' do
-    find('body').native.send_key('g')
-    find('body').native.send_key('m')
-  end
-end

features/steps/shared/sidebar_active_tab.rb

-module SharedSidebarActiveTab
-  include Spinach::DSL
-
-  step 'no other main tabs should be active' do
-    expect(page).to have_selector('.nav-sidebar li.active', count: 1)
-  end
-
-  def ensure_active_main_tab(content)
-    expect(find('.nav-sidebar li.active')).to have_content(content)
-  end
-
-  step 'the active main tab should be Home' do
-    ensure_active_main_tab('Projects')
-  end
-
-  step 'the active main tab should be Groups' do
-    ensure_active_main_tab('Groups')
-  end
-
-  step 'the active main tab should be Projects' do
-    ensure_active_main_tab('Projects')
-  end
-
-  step 'the active main tab should be Issues' do
-    ensure_active_main_tab('Issues')
-  end
-
-  step 'the active main tab should be Merge Requests' do
-    ensure_active_main_tab('Merge Requests')
-  end
-end

features/steps/shared/user.rb

-module SharedUser
-  include Spinach::DSL
-
-  step 'User "John Doe" exists' do
-    user_exists("John Doe", { username: "john_doe" })
-  end
-
-  step 'User "Mary Jane" exists' do
-    user_exists("Mary Jane", { username: "mary_jane" })
-  end
-
-  step 'gitlab user "Mike"' do
-    create(:user, name: "Mike")
-  end
-
-  protected
-
-  def user_exists(name, options = {})
-    User.find_by(name: name) || create(:user, { name: name, admin: false }.merge(options))
-  end
-
-  step 'I have no ssh keys' do
-    @user.keys.delete_all
-  end
-
-  step 'I click on "Personal projects" tab' do
-    page.within '.nav-links' do
-      click_link 'Personal projects'
-    end
-
-    expect(page).to have_css('.tab-content #projects.active')
-  end
-
-  step 'I click on "Contributed projects" tab' do
-    page.within '.nav-links' do
-      click_link 'Contributed projects'
-    end
-
-    expect(page).to have_css('.tab-content #contributed.active')
-  end
-end