Merge branch 'master' into upgrade-to-webpack-v4

* master: (252 commits)
  Upgrade underscore.js
  Enable prometheus metrics by default
  Add signature verification badge to compare view
  Add Changelog
  Update instalation from source guide
  fix Web IDE file tree scroll issue
  Enable quick support actions default
  Backport of 4084-epics-username-autocomplete
  Remove top margin on the terms page with performance bar
  Backports every CE related change from ee-44542 to CE
  Fix typo in changelog entry
  fix missing space
  Backport IdentityLinker#failed? from GroupSaml callback flow
  Add ci_cd_settings delete_all dependency on project
  AutoDevOps Docs fix invalid external link
  Ignore knapsack and rspec_flaky
  Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user
  Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages
  Reuses `InternalRedirect` when possible
  Enforces terms in the web application
  ...

19 files changed, 1087 insertions, 235 deletions

diff --git a/spec/features/admin/admin_runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index 8de2e3d199b..3465ccfc423 100644
--- a/spec/features/admin/admin_runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb
@@ -59,6 +59,47 @@ describe "Admin Runners" do
         expect(page).to have_text 'No runners found'
       end
     end
+
+    context 'group runner' do
+      let(:group) { create(:group) }
+      let!(:runner) { create(:ci_runner, groups: [group], runner_type: :group_type) }
+
+      it 'shows the label and does not show the project count' do
+        visit admin_runners_path
+
+        within "#runner_#{runner.id}" do
+          expect(page).to have_selector '.label', text: 'group'
+          expect(page).to have_text 'n/a'
+        end
+      end
+    end
+
+    context 'shared runner' do
+      it 'shows the label and does not show the project count' do
+        runner = create :ci_runner, :shared
+
+        visit admin_runners_path
+
+        within "#runner_#{runner.id}" do
+          expect(page).to have_selector '.label', text: 'shared'
+          expect(page).to have_text 'n/a'
+        end
+      end
+    end
+
+    context 'specific runner' do
+      it 'shows the label and the project count' do
+        project = create :project
+        runner = create :ci_runner, projects: [project]
+
+        visit admin_runners_path
+
+        within "#runner_#{runner.id}" do
+          expect(page).to have_selector '.label', text: 'specific'
+          expect(page).to have_text '1'
+        end
+      end
+    end
   end
 
   describe "Runner show page" do
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 7853d2952ea..f2f9b734c39 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -2,10 +2,13 @@ require 'spec_helper'
 
 feature 'Admin updates settings' do
   include StubENV
+  include TermsHelper
+
+  let(:admin) { create(:admin) }
 
   before do
     stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
-    sign_in(create(:admin))
+    sign_in(admin)
     visit admin_application_settings_path
   end
 
@@ -85,6 +88,22 @@ feature 'Admin updates settings' do
     expect(page).to have_content "Application settings saved successfully"
   end
 
+  scenario 'Terms of Service' do
+    # Already have the admin accept terms, so they don't need to accept in this spec.
+    _existing_terms = create(:term)
+    accept_terms(admin)
+
+    page.within('.as-terms') do
+      check 'Require all users to accept Terms of Service when they access GitLab.'
+      fill_in 'Terms of Service Agreement', with: 'Be nice!'
+      click_button 'Save changes'
+    end
+
+    expect(Gitlab::CurrentSettings.enforce_terms).to be(true)
+    expect(Gitlab::CurrentSettings.terms).to eq 'Be nice!'
+    expect(page).to have_content 'Application settings saved successfully'
+  end
+
   scenario 'Modify oauth providers' do
     expect(Gitlab::CurrentSettings.disabled_oauth_sign_in_sources).to be_empty
 
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index 8f0a3611052..8fc57f4b4c3 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -285,7 +285,7 @@ describe "Admin::Users" do
     it "lists group projects" do
       within(:css, '.append-bottom-default + .panel') do
         expect(page).to have_content 'Group projects'
-        expect(page).to have_link group.name, admin_group_path(group)
+        expect(page).to have_link group.name, href: admin_group_path(group)
       end
     end
 
diff --git a/spec/features/admin/admin_uses_repository_checks_spec.rb b/spec/features/admin/admin_uses_repository_checks_spec.rb
index f1ac73ff819..90cf5a53787 100644
--- a/spec/features/admin/admin_uses_repository_checks_spec.rb
+++ b/spec/features/admin/admin_uses_repository_checks_spec.rb
@@ -19,7 +19,7 @@ feature 'Admin uses repository checks' do
     expect(page).to have_content('Repository check was triggered')
   end
 
-  scenario 'to see a single failed repository check' do
+  scenario 'to see a single failed repository check', :js do
     project = create(:project)
     project.update_columns(
       last_repository_check_failed: true,
diff --git a/spec/features/issues/user_uses_slash_commands_spec.rb b/spec/features/issues/user_uses_slash_commands_spec.rb
index ff2a0e15719..fd0aa6cf3a3 100644
--- a/spec/features/issues/user_uses_slash_commands_spec.rb
+++ b/spec/features/issues/user_uses_slash_commands_spec.rb
@@ -161,6 +161,7 @@ feature 'Issues > User uses quick actions', :js do
 
         before do
           target_project.add_master(user)
+          gitlab_sign_out
           sign_in(user)
           visit project_issue_path(project, issue)
         end
@@ -178,9 +179,10 @@ feature 'Issues > User uses quick actions', :js do
       end
 
       context 'when the project is valid but the user not authorized' do
-        let(:project_unauthorized) {create(:project, :public)}
+        let(:project_unauthorized) { create(:project, :public) }
 
         before do
+          gitlab_sign_out
           sign_in(user)
           visit project_issue_path(project, issue)
         end
@@ -195,6 +197,7 @@ feature 'Issues > User uses quick actions', :js do
 
       context 'when the project is invalid' do
         before do
+          gitlab_sign_out
           sign_in(user)
           visit project_issue_path(project, issue)
         end
@@ -218,6 +221,7 @@ feature 'Issues > User uses quick actions', :js do
 
         before do
           target_project.add_master(user)
+          gitlab_sign_out
           sign_in(user)
           visit project_issue_path(project, issue)
         end
diff --git a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
index dbca279569a..42c279af117 100644
--- a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
+++ b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
@@ -19,7 +19,7 @@ describe 'Merge request > User selects branches for new MR', :js do
     expect(page).to have_content('Target branch')
 
     first('.js-source-branch').click
-    find('.dropdown-source-branch .dropdown-content a', match: :first).click
+    find('.js-source-branch-dropdown .dropdown-content a', match: :first).click
 
     expect(page).to have_content "b83d6e3"
   end
@@ -35,22 +35,16 @@ describe 'Merge request > User selects branches for new MR', :js do
     expect(page).to have_content('Target branch')
 
     first('.js-target-branch').click
-    find('.dropdown-target-branch .dropdown-content a', text: 'v1.1.0', match: :first).click
+    find('.js-target-branch-dropdown .dropdown-content a', text: 'v1.1.0', match: :first).click
 
     expect(page).to have_content "b83d6e3"
   end
 
   it 'generates a diff for an orphaned branch' do
-    visit project_merge_requests_path(project)
-
-    page.within '.content' do
-      click_link 'New merge request'
-    end
-    expect(page).to have_content('Source branch')
-    expect(page).to have_content('Target branch')
+    visit project_new_merge_request_path(project)
 
     find('.js-source-branch', match: :first).click
-    find('.dropdown-source-branch .dropdown-content a', text: 'orphaned-branch', match: :first).click
+    find('.js-source-branch-dropdown .dropdown-content a', text: 'orphaned-branch', match: :first).click
 
     click_button "Compare branches"
     click_link "Changes"
@@ -71,19 +65,18 @@ describe 'Merge request > User selects branches for new MR', :js do
 
     first('.js-source-branch').click
 
-    input = find('.dropdown-source-branch .dropdown-input-field')
-    input.click
-    input.send_keys('orphaned-branch')
+    page.within '.js-source-branch-dropdown' do
+      input = find('.dropdown-input-field')
+      input.click
+      input.send_keys('orphaned-branch')
 
-    find('.dropdown-source-branch .dropdown-content li', match: :first)
-    source_items = all('.dropdown-source-branch .dropdown-content li')
-
-    expect(source_items.count).to eq(1)
+      expect(page).to have_css('.dropdown-content li', count: 1)
+    end
 
     first('.js-target-branch').click
 
-    find('.dropdown-target-branch .dropdown-content li', match: :first)
-    target_items = all('.dropdown-target-branch .dropdown-content li')
+    find('.js-target-branch-dropdown .dropdown-content li', match: :first)
+    target_items = all('.js-target-branch-dropdown .dropdown-content li')
 
     expect(target_items.count).to be > 1
   end
@@ -171,7 +164,6 @@ describe 'Merge request > User selects branches for new MR', :js do
 
       page.within('.merge-request') do
         click_link 'Pipelines'
-        wait_for_requests
 
         expect(page).to have_content "##{pipeline.id}"
       end
diff --git a/spec/features/profiles/active_sessions_spec.rb b/spec/features/profiles/active_sessions_spec.rb
new file mode 100644
index 00000000000..4045cfd21c4
--- /dev/null
+++ b/spec/features/profiles/active_sessions_spec.rb
@@ -0,0 +1,89 @@
+require 'rails_helper'
+
+feature 'Profile > Active Sessions', :clean_gitlab_redis_shared_state do
+  let(:user) do
+    create(:user).tap do |user|
+      user.current_sign_in_at = Time.current
+    end
+  end
+
+  around do |example|
+    Timecop.freeze(Time.zone.parse('2018-03-12 09:06')) do
+      example.run
+    end
+  end
+
+  scenario 'User sees their active sessions' do
+    Capybara::Session.new(:session1)
+    Capybara::Session.new(:session2)
+
+    # note: headers can only be set on the non-js (aka. rack-test) driver
+    using_session :session1 do
+      Capybara.page.driver.header(
+        'User-Agent',
+        'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:58.0) Gecko/20100101 Firefox/58.0'
+      )
+
+      gitlab_sign_in(user)
+    end
+
+    # set an additional session on another device
+    using_session :session2 do
+      Capybara.page.driver.header(
+        'User-Agent',
+        'Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_3 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12B466 [FBDV/iPhone7,2]'
+      )
+
+      gitlab_sign_in(user)
+    end
+
+    using_session :session1 do
+      visit profile_active_sessions_path
+
+      expect(page).to have_content(
+        '127.0.0.1 ' \
+        'This is your current session ' \
+        'Firefox on Ubuntu ' \
+        'Signed in on 12 Mar 09:06'
+      )
+
+      expect(page).to have_selector '[title="Desktop"]', count: 1
+
+      expect(page).to have_content(
+        '127.0.0.1 ' \
+        'Last accessed on 12 Mar 09:06 ' \
+        'Mobile Safari on iOS ' \
+        'Signed in on 12 Mar 09:06'
+      )
+
+      expect(page).to have_selector '[title="Smartphone"]', count: 1
+    end
+  end
+
+  scenario 'User can revoke a session', :js, :redis_session_store do
+    Capybara::Session.new(:session1)
+    Capybara::Session.new(:session2)
+
+    # set an additional session in another browser
+    using_session :session2 do
+      gitlab_sign_in(user)
+    end
+
+    using_session :session1 do
+      gitlab_sign_in(user)
+      visit profile_active_sessions_path
+
+      expect(page).to have_link('Revoke', count: 1)
+
+      accept_confirm { click_on 'Revoke' }
+
+      expect(page).not_to have_link('Revoke')
+    end
+
+    using_session :session2 do
+      visit profile_active_sessions_path
+
+      expect(page).to have_content('You need to sign in or sign up before continuing.')
+    end
+  end
+end
diff --git a/spec/features/projects/commits/user_browses_commits_spec.rb b/spec/features/projects/commits/user_browses_commits_spec.rb
index b650c1f4197..35ed6620548 100644
--- a/spec/features/projects/commits/user_browses_commits_spec.rb
+++ b/spec/features/projects/commits/user_browses_commits_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe 'User browses commits' do
+  include RepoHelpers
+
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository, namespace: user.namespace) }
 
@@ -9,13 +11,68 @@ describe 'User browses commits' do
     sign_in(user)
   end
 
+  it 'renders commit' do
+    visit project_commit_path(project, sample_commit.id)
+
+    expect(page).to have_content(sample_commit.message)
+      .and have_content("Showing #{sample_commit.files_changed_count} changed files")
+      .and have_content('Side-by-side')
+  end
+
+  it 'fill commit sha when click new tag from commit page' do
+    visit project_commit_path(project, sample_commit.id)
+    click_link 'Tag'
+
+    expect(page).to have_selector("input[value='#{sample_commit.id}']", visible: false)
+  end
+
+  it 'renders inline diff button when click side-by-side diff button' do
+    visit project_commit_path(project, sample_commit.id)
+    find('#parallel-diff-btn').click
+
+    expect(page).to have_content 'Inline'
+  end
+
+  it 'renders breadcrumbs on specific commit path' do
+    visit project_commits_path(project, project.repository.root_ref + '/files/ruby/regex.rb', limit: 5)
+
+    expect(page).to have_selector('ul.breadcrumb')
+      .and have_selector('ul.breadcrumb a', count: 4)
+  end
+
+  it 'renders diff links to both the previous and current image' do
+    visit project_commit_path(project, sample_image_commit.id)
+
+    links = page.all('.file-actions a')
+    expect(links[0]['href']).to match %r{blob/#{sample_image_commit.old_blob_id}}
+    expect(links[1]['href']).to match %r{blob/#{sample_image_commit.new_blob_id}}
+  end
+
+  context 'when commit has ci status' do
+    let(:pipeline) { create(:ci_pipeline, project: project, sha: sample_commit.id) }
+
+    before do
+      project.enable_ci
+
+      create(:ci_build, pipeline: pipeline)
+
+      allow_any_instance_of(Ci::Pipeline).to receive(:ci_yaml_file).and_return('')
+    end
+
+    it 'renders commit ci info' do
+      visit project_commit_path(project, sample_commit.id)
+
+      expect(page).to have_content "Pipeline ##{pipeline.id} pending"
+    end
+  end
+
   context 'primary email' do
     it 'finds a commit by a primary email' do
       user = create(:user, email: 'dmitriy.zaporozhets@gmail.com')
 
-      visit(project_commit_path(project, RepoHelpers.sample_commit.id))
+      visit(project_commit_path(project, sample_commit.id))
 
-      check_author_link(RepoHelpers.sample_commit.author_email, user)
+      check_author_link(sample_commit.author_email, user)
     end
   end
 
@@ -26,9 +83,9 @@ describe 'User browses commits' do
           create(:email, { user: user, email: 'dmitriy.zaporozhets@gmail.com' })
         end
 
-      visit(project_commit_path(project, RepoHelpers.sample_commit.parent_id))
+      visit(project_commit_path(project, sample_commit.parent_id))
 
-      check_author_link(RepoHelpers.sample_commit.author_email, user)
+      check_author_link(sample_commit.author_email, user)
     end
   end
 
@@ -44,6 +101,135 @@ describe 'User browses commits' do
       expect(find('.diff-file-changes', visible: false)).to have_content('No file name available')
     end
   end
+
+  describe 'commits list' do
+    let(:visit_commits_page) do
+      visit project_commits_path(project, project.repository.root_ref, limit: 5)
+    end
+
+    it 'searches commit', :js do
+      visit_commits_page
+      fill_in 'commits-search', with: 'submodules'
+
+      expect(page).to have_content 'More submodules'
+      expect(page).not_to have_content 'Change some files'
+    end
+
+    it 'renders commits atom feed' do
+      visit_commits_page
+      click_link('Commits feed')
+
+      commit = project.repository.commit
+
+      expect(response_headers['Content-Type']).to have_content("application/atom+xml")
+      expect(body).to have_selector('title', text: "#{project.name}:master commits")
+        .and have_selector('author email', text: commit.author_email)
+        .and have_selector('entry summary', text: commit.description[0..10].delete("\r\n"))
+    end
+
+    context 'master branch' do
+      before do
+        visit_commits_page
+      end
+
+      it 'renders project commits' do
+        commit = project.repository.commit
+
+        expect(page).to have_content(project.name)
+          .and have_content(commit.message[0..20])
+          .and have_content(commit.short_id)
+      end
+
+      it 'does not render create merge request button' do
+        expect(page).not_to have_link 'Create merge request'
+      end
+
+      context 'when click the compare tab' do
+        before do
+          click_link('Compare')
+        end
+
+        it 'does not render create merge request button' do
+          expect(page).not_to have_link 'Create merge request'
+        end
+      end
+    end
+
+    context 'feature branch' do
+      let(:visit_commits_page) do
+        visit project_commits_path(project, 'feature')
+      end
+
+      context 'when project does not have open merge requests' do
+        before do
+          visit_commits_page
+        end
+
+        it 'renders project commits' do
+          commit = project.repository.commit('0b4bc9a')
+
+          expect(page).to have_content(project.name)
+            .and have_content(commit.message[0..12])
+            .and have_content(commit.short_id)
+        end
+
+        it 'renders create merge request button' do
+          expect(page).to have_link 'Create merge request'
+        end
+
+        context 'when click the compare tab' do
+          before do
+            click_link('Compare')
+          end
+
+          it 'renders create merge request button' do
+            expect(page).to have_link 'Create merge request'
+          end
+        end
+      end
+
+      context 'when project have open merge request' do
+        let!(:merge_request) do
+          create(
+            :merge_request,
+            title: 'Feature',
+            source_project: project,
+            source_branch: 'feature',
+            target_branch: 'master',
+            author: project.users.first
+          )
+        end
+
+        before do
+          visit_commits_page
+        end
+
+        it 'renders project commits' do
+          commit = project.repository.commit('0b4bc9a')
+
+          expect(page).to have_content(project.name)
+            .and have_content(commit.message[0..12])
+            .and have_content(commit.short_id)
+        end
+
+        it 'renders button to the merge request' do
+          expect(page).not_to have_link 'Create merge request'
+          expect(page).to have_link 'View open merge request', href: project_merge_request_path(project, merge_request)
+        end
+
+        context 'when click the compare tab' do
+          before do
+            click_link('Compare')
+          end
+
+          it 'renders button to the merge request' do
+            expect(page).not_to have_link 'Create merge request'
+            expect(page).to have_link 'View open merge request', href: project_merge_request_path(project, merge_request)
+          end
+        end
+      end
+    end
+  end
 end
 
 private
diff --git a/spec/features/projects/compare_spec.rb b/spec/features/projects/compare_spec.rb
index 1fb22fd0e4c..7e863d9df32 100644
--- a/spec/features/projects/compare_spec.rb
+++ b/spec/features/projects/compare_spec.rb
@@ -7,16 +7,19 @@ describe "Compare", :js do
   before do
     project.add_master(user)
     sign_in user
-    visit project_compare_index_path(project, from: "master", to: "master")
   end
 
   describe "branches" do
     it "pre-populates fields" do
+      visit project_compare_index_path(project, from: "master", to: "master")
+
       expect(find(".js-compare-from-dropdown .dropdown-toggle-text")).to have_content("master")
       expect(find(".js-compare-to-dropdown .dropdown-toggle-text")).to have_content("master")
     end
 
     it "compares branches" do
+      visit project_compare_index_path(project, from: "master", to: "master")
+
       select_using_dropdown "from", "feature"
       expect(find(".js-compare-from-dropdown .dropdown-toggle-text")).to have_content("feature")
 
@@ -26,9 +29,58 @@ describe "Compare", :js do
       click_button "Compare"
 
       expect(page).to have_content "Commits"
+      expect(page).to have_link 'Create merge request'
+    end
+
+    it 'renders additions info when click unfold diff' do
+      visit project_compare_index_path(project)
+
+      select_using_dropdown('from', RepoHelpers.sample_commit.parent_id, commit: true)
+      select_using_dropdown('to', RepoHelpers.sample_commit.id, commit: true)
+
+      click_button 'Compare'
+      expect(page).to have_content 'Commits (1)'
+      expect(page).to have_content "Showing 2 changed files"
+
+      diff = first('.js-unfold')
+      diff.click
+      wait_for_requests
+
+      page.within diff.query_scope do
+        expect(first('.new_line').text).not_to have_content "..."
+      end
+    end
+
+    context 'when project have an open merge request' do
+      let!(:merge_request) do
+        create(
+          :merge_request,
+          title: 'Feature',
+          source_project: project,
+          source_branch: 'feature',
+          target_branch: 'master',
+          author: project.users.first
+        )
+      end
+
+      it 'compares branches' do
+        visit project_compare_index_path(project)
+
+        select_using_dropdown('from', 'master')
+        select_using_dropdown('to', 'feature')
+
+        click_button 'Compare'
+
+        expect(page).to have_content 'Commits (1)'
+        expect(page).to have_content 'Showing 1 changed file with 5 additions and 0 deletions'
+        expect(page).to have_link 'View open merge request', href: project_merge_request_path(project, merge_request)
+        expect(page).not_to have_link 'Create merge request'
+      end
     end
 
     it "filters branches" do
+      visit project_compare_index_path(project, from: "master", to: "master")
+
       select_using_dropdown("from", "wip")
 
       find(".js-compare-from-dropdown .compare-dropdown-toggle").click
@@ -39,6 +91,8 @@ describe "Compare", :js do
 
   describe "tags" do
     it "compares tags" do
+      visit project_compare_index_path(project, from: "master", to: "master")
+
       select_using_dropdown "from", "v1.0.0"
       expect(find(".js-compare-from-dropdown .dropdown-toggle-text")).to have_content("v1.0.0")
 
@@ -50,15 +104,20 @@ describe "Compare", :js do
     end
   end
 
-  def select_using_dropdown(dropdown_type, selection)
+  def select_using_dropdown(dropdown_type, selection, commit: false)
     dropdown = find(".js-compare-#{dropdown_type}-dropdown")
     dropdown.find(".compare-dropdown-toggle").click
     # find input before using to wait for the inputs visiblity
     dropdown.find('.dropdown-menu')
     dropdown.fill_in("Filter by Git revision", with: selection)
     wait_for_requests
-    # find before all to wait for the items visiblity
-    dropdown.find("a[data-ref=\"#{selection}\"]", match: :first)
-    dropdown.all("a[data-ref=\"#{selection}\"]").last.click
+
+    if commit
+      dropdown.find('input[type="search"]').send_keys(:return)
+    else
+      # find before all to wait for the items visiblity
+      dropdown.find("a[data-ref=\"#{selection}\"]", match: :first)
+      dropdown.all("a[data-ref=\"#{selection}\"]").last.click
+    end
   end
 end
diff --git a/spec/features/projects/files/user_browses_files_spec.rb b/spec/features/projects/files/user_browses_files_spec.rb
index 9c1f11f4c12..41f6c52fb8a 100644
--- a/spec/features/projects/files/user_browses_files_spec.rb
+++ b/spec/features/projects/files/user_browses_files_spec.rb
@@ -1,14 +1,12 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'Projects > Files > User browses files' do
+describe "User browses files" do
   let(:fork_message) do
     "You're not allowed to make changes to this project directly. "\
     "A fork of this project has been created that you can make changes in, so you can submit a merge request."
   end
-  let(:project) { create(:project, :repository, name: 'Shop') }
-  let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
-  let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
-  let(:tree_path_ref_6d39438) { project_tree_path(project, '6d39438') }
+  let(:project) { create(:project, :repository, name: "Shop") }
+  let(:project2) { create(:project, :repository, name: "Another Project", path: "another-project") }
   let(:tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
   let(:user) { project.owner }
 
@@ -16,57 +14,55 @@ describe 'Projects > Files > User browses files' do
     sign_in(user)
   end
 
-  it 'shows last commit for current directory' do
+  it "shows last commit for current directory" do
     visit(tree_path_root_ref)
 
-    click_link 'files'
+    click_link("files")
 
-    last_commit = project.repository.last_commit_for_path(project.default_branch, 'files')
-    page.within('.blob-commit-info') do
-      expect(page).to have_content last_commit.short_id
-      expect(page).to have_content last_commit.author_name
+    last_commit = project.repository.last_commit_for_path(project.default_branch, "files")
+
+    page.within(".blob-commit-info") do
+      expect(page).to have_content(last_commit.short_id).and have_content(last_commit.author_name)
     end
   end
 
-  context 'when browsing the master branch' do
+  context "when browsing the master branch" do
     before do
       visit(tree_path_root_ref)
     end
 
-    it 'shows files from a repository' do
-      expect(page).to have_content('VERSION')
-      expect(page).to have_content('.gitignore')
-      expect(page).to have_content('LICENSE')
+    it "shows files from a repository" do
+      expect(page).to have_content("VERSION")
+                 .and have_content(".gitignore")
+                 .and have_content("LICENSE")
     end
 
-    it 'shows the "Browse Directory" link' do
-      click_link('files')
-      click_link('History')
+    it "shows the `Browse Directory` link" do
+      click_link("files")
+      click_link("History")
 
-      expect(page).to have_link('Browse Directory')
-      expect(page).not_to have_link('Browse Code')
+      expect(page).to have_link("Browse Directory").and have_no_link("Browse Code")
     end
 
-    it 'shows the "Browse File" link' do
-      page.within('.tree-table') do
-        click_link('README.md')
+    it "shows the `Browse File` link" do
+      page.within(".tree-table") do
+        click_link("README.md")
       end
-      click_link('History')
 
-      expect(page).to have_link('Browse File')
-      expect(page).not_to have_link('Browse Files')
+      click_link("History")
+
+      expect(page).to have_link("Browse File").and have_no_link("Browse Files")
     end
 
-    it 'shows the "Browse Files" link' do
-      click_link('History')
+    it "shows the `Browse Files` link" do
+      click_link("History")
 
-      expect(page).to have_link('Browse Files')
-      expect(page).not_to have_link('Browse Directory')
+      expect(page).to have_link("Browse Files").and have_no_link("Browse Directory")
     end
 
-    it 'redirects to the permalink URL' do
-      click_link('.gitignore')
-      click_link('Permalink')
+    it "redirects to the permalink URL" do
+      click_link(".gitignore")
+      click_link("Permalink")
 
       permalink_path = project_blob_path(project, "#{project.repository.commit.sha}/.gitignore")
 
@@ -74,80 +70,180 @@ describe 'Projects > Files > User browses files' do
     end
   end
 
-  context 'when browsing a specific ref' do
+  context "when browsing the `markdown` branch", :js do
+    context "when browsing the root" do
+      before do
+        visit(project_tree_path(project, "markdown"))
+      end
+
+      it "shows correct files and links" do
+        # rubocop:disable Lint/Void
+        # Test the full URLs of links instead of relative paths by `have_link(text: "...", href: "...")`.
+        find("a", text: /^empty$/)["href"]            == project_tree_url(project, "markdown")
+        find("a", text: /^#id$/)["href"]              == project_tree_url(project, "markdown", anchor: "#id")
+        find("a", text: %r{^/#id$})["href"]           == project_tree_url(project, "markdown", anchor: "#id")
+        find("a", text: /^README.md#id$/)["href"]     == project_blob_url(project, "markdown/README.md", anchor: "#id")
+        find("a", text: %r{^d/README.md#id$})["href"] == project_blob_url(project, "d/markdown/README.md", anchor: "#id")
+        # rubocop:enable Lint/Void
+
+        expect(current_path).to eq(project_tree_path(project, "markdown"))
+        expect(page).to have_content("README.md")
+                   .and have_content("CHANGELOG")
+                   .and have_content("Welcome to GitLab GitLab is a free project and repository management application")
+                   .and have_link("GitLab API doc")
+                   .and have_link("GitLab API website")
+                   .and have_link("Rake tasks")
+                   .and have_link("backup and restore procedure")
+                   .and have_link("GitLab API doc directory")
+                   .and have_link("Maintenance")
+                   .and have_header_with_correct_id_and_link(2, "Application details", "application-details")
+      end
+
+      it "shows correct content of file" do
+        click_link("GitLab API doc")
+
+        expect(current_path).to eq(project_blob_path(project, "markdown/doc/api/README.md"))
+        expect(page).to have_content("All API requests require authentication")
+                   .and have_content("Contents")
+                   .and have_link("Users")
+                   .and have_link("Rake tasks")
+                   .and have_header_with_correct_id_and_link(1, "GitLab API", "gitlab-api")
+
+        click_link("Users")
+
+        expect(current_path).to eq(project_blob_path(project, "markdown/doc/api/users.md"))
+        expect(page).to have_content("Get a list of users.")
+
+        page.go_back
+
+        click_link("Rake tasks")
+
+        expect(current_path).to eq(project_tree_path(project, "markdown/doc/raketasks"))
+        expect(page).to have_content("backup_restore.md").and have_content("maintenance.md")
+
+        click_link("shop")
+        click_link("Maintenance")
+
+        expect(current_path).to eq(project_blob_path(project, "markdown/doc/raketasks/maintenance.md"))
+        expect(page).to have_content("bundle exec rake gitlab:env:info RAILS_ENV=production")
+
+        click_link("shop")
+
+        page.within(".tree-table") do
+          click_link("README.md")
+        end
+
+        page.go_back
+
+        page.within(".tree-table") do
+          click_link("d")
+        end
+
+        # rubocop:disable Lint/Void
+        # Test the full URLs of links instead of relative paths by `have_link(text: "...", href: "...")`.
+        find("a", text: /^empty$/)["href"] == project_tree_url(project, "markdown/d")
+        # rubocop:enable Lint/Void
+
+        page.within(".tree-table") do
+          click_link("README.md")
+        end
+
+        # rubocop:disable Lint/Void
+        # Test the full URLs of links instead of relative paths by `have_link(text: "...", href: "...")`.
+        find("a", text: /^empty$/)["href"] == project_blob_url(project, "markdown/d/README.md")
+        # rubocop:enable Lint/Void
+      end
+
+      it "shows correct content of directory" do
+        click_link("GitLab API doc directory")
+
+        expect(current_path).to eq(project_tree_path(project, "markdown/doc/api"))
+        expect(page).to have_content("README.md").and have_content("users.md")
+
+        click_link("Users")
+
+        expect(current_path).to eq(project_blob_path(project, "markdown/doc/api/users.md"))
+        expect(page).to have_content("List users").and have_content("Get a list of users.")
+      end
+    end
+  end
+
+  context "when browsing a specific ref" do
+    let(:ref) { project_tree_path(project, "6d39438") }
+
     before do
-      visit(tree_path_ref_6d39438)
+      visit(ref)
     end
 
-    it 'shows files from a repository for "6d39438"' do
-      expect(current_path).to eq(tree_path_ref_6d39438)
-      expect(page).to have_content('.gitignore')
-      expect(page).to have_content('LICENSE')
+    it "shows files from a repository for `6d39438`" do
+      expect(current_path).to eq(ref)
+      expect(page).to have_content(".gitignore").and have_content("LICENSE")
     end
 
-    it 'shows files from a repository with apostroph in its name', :js do
-      first('.js-project-refs-dropdown').click
+    it "shows files from a repository with apostroph in its name", :js do
+      first(".js-project-refs-dropdown").click
 
-      page.within('.project-refs-form') do
+      page.within(".project-refs-form") do
         click_link("'test'")
       end
 
-      expect(page).to have_selector('.dropdown-toggle-text', text: "'test'")
+      expect(page).to have_selector(".dropdown-toggle-text", text: "'test'")
 
       visit(project_tree_path(project, "'test'"))
 
-      expect(page).to have_css('.tree-commit-link', visible: true)
-      expect(page).not_to have_content('Loading commit data...')
+      expect(page).to have_css(".tree-commit-link").and have_no_content("Loading commit data...")
     end
 
-    it 'shows the code with a leading dot in the directory', :js do
-      first('.js-project-refs-dropdown').click
+    it "shows the code with a leading dot in the directory", :js do
+      first(".js-project-refs-dropdown").click
 
-      page.within('.project-refs-form') do
-        click_link('fix')
+      page.within(".project-refs-form") do
+        click_link("fix")
       end
 
-      visit(project_tree_path(project, 'fix/.testdir'))
+      visit(project_tree_path(project, "fix/.testdir"))
 
-      expect(page).to have_css('.tree-commit-link', visible: true)
-      expect(page).not_to have_content('Loading commit data...')
+      expect(page).to have_css(".tree-commit-link").and have_no_content("Loading commit data...")
     end
 
-    it 'does not show the permalink link' do
-      click_link('.gitignore')
+    it "does not show the permalink link" do
+      click_link(".gitignore")
 
-      expect(page).not_to have_link('permalink')
+      expect(page).not_to have_link("permalink")
     end
   end
 
-  context 'when browsing a file content' do
+  context "when browsing a file content" do
     before do
       visit(tree_path_root_ref)
-      click_link('.gitignore')
+
+      click_link(".gitignore")
     end
 
-    it 'shows a file content', :js do
-      wait_for_requests
-      expect(page).to have_content('*.rbc')
+    it "shows a file content", :js do
+      expect(page).to have_content("*.rbc")
     end
 
-    it 'is possible to blame' do
-      click_link 'Blame'
+    it "is possible to blame" do
+      click_link("Blame")
 
-      expect(page).to have_content "*.rb"
-      expect(page).to have_content "Dmitriy Zaporozhets"
-      expect(page).to have_content "Initial commit"
+      expect(page).to have_content("*.rb")
+                 .and have_content("Dmitriy Zaporozhets")
+                 .and have_content("Initial commit")
     end
   end
 
-  context 'when browsing a raw file' do
+  context "when browsing a raw file" do
     before do
-      visit(project_blob_path(project, File.join(RepoHelpers.sample_commit.id, RepoHelpers.sample_blob.path)))
+      path = File.join(RepoHelpers.sample_commit.id, RepoHelpers.sample_blob.path)
+
+      visit(project_blob_path(project, path))
     end
 
-    it 'shows a raw file content' do
-      click_link('Open raw')
-      expect(source).to eq('') # Body is filled in by gitlab-workhorse
+    it "shows a raw file content" do
+      click_link("Open raw")
+
+      expect(source).to eq("") # Body is filled in by gitlab-workhorse
     end
   end
 end
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index b25f5161748..60fe30bd898 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -46,7 +46,7 @@ feature 'Import/Export - project import integration test', :js do
         expect(project.merge_requests).not_to be_empty
         expect(project_hook_exists?(project)).to be true
         expect(wiki_exists?(project)).to be true
-        expect(project.import_status).to eq('finished')
+        expect(project.import_state.status).to eq('finished')
       end
     end
 
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 705ba78a0b7..90e28483c6c 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -388,9 +388,9 @@ describe 'Pipelines', :js do
 
           it 'should be possible to cancel pending build' do
             find('.js-builds-dropdown-button').click
-            find('a.js-ci-action-icon').click
+            find('.js-ci-action').click
+            wait_for_requests
 
-            expect(page).to have_content('canceled')
             expect(build.reload).to be_canceled
           end
         end
@@ -407,7 +407,7 @@ describe 'Pipelines', :js do
 
             within('.js-builds-dropdown-list') do
               build_element = page.find('.mini-pipeline-graph-dropdown-item')
-              expect(build_element['data-title']).to eq('build - failed <br> (unknown failure)')
+              expect(build_element['data-original-title']).to eq('build - failed <br> (unknown failure)')
             end
           end
         end
@@ -517,16 +517,31 @@ describe 'Pipelines', :js do
           end
 
           it 'creates a new pipeline' do
-            expect { click_on 'Run pipeline' }
+            expect { click_on 'Create pipeline' }
               .to change { Ci::Pipeline.count }.by(1)
 
             expect(Ci::Pipeline.last).to be_web
           end
+
+          context 'when variables are specified' do
+            it 'creates a new pipeline with variables' do
+              page.within '.ci-variable-row-body' do
+                fill_in "Input variable key", with: "key_name"
+                fill_in "Input variable value", with: "value"
+              end
+
+              expect { click_on 'Create pipeline' }
+                .to change { Ci::Pipeline.count }.by(1)
+
+              expect(Ci::Pipeline.last.variables.map { |var| var.slice(:key, :secret_value) })
+                .to eq [{ key: "key_name", secret_value: "value" }.with_indifferent_access]
+            end
+          end
         end
 
         context 'without gitlab-ci.yml' do
           before do
-            click_on 'Run pipeline'
+            click_on 'Create pipeline'
           end
 
           it { expect(page).to have_content('Missing .gitlab-ci.yml file') }
@@ -539,7 +554,7 @@ describe 'Pipelines', :js do
               click_link 'master'
             end
 
-            expect { click_on 'Run pipeline' }
+            expect { click_on 'Create pipeline' }
               .to change { Ci::Pipeline.count }.by(1)
           end
         end
@@ -557,7 +572,7 @@ describe 'Pipelines', :js do
         it 'has field to add a new pipeline' do
           expect(page).to have_selector('.js-branch-select')
           expect(find('.js-branch-select')).to have_content project.default_branch
-          expect(page).to have_content('Run on')
+          expect(page).to have_content('Create for')
         end
       end
 
diff --git a/spec/features/projects/settings/lfs_settings_spec.rb b/spec/features/projects/settings/lfs_settings_spec.rb
index 0fd28a5681c..342be1d2a9d 100644
--- a/spec/features/projects/settings/lfs_settings_spec.rb
+++ b/spec/features/projects/settings/lfs_settings_spec.rb
@@ -1,21 +1,27 @@
 require 'rails_helper'
 
 describe 'Projects > Settings > LFS settings' do
-  let(:admin) { create(:admin) }
   let(:project) { create(:project) }
+  let(:user) { create(:user) }
+  let(:role) { :master }
 
   context 'LFS enabled setting' do
     before do
       allow(Gitlab.config.lfs).to receive(:enabled).and_return(true)
 
-      sign_in(admin)
+      sign_in(user)
+      project.add_role(user, role)
     end
 
-    it 'displays the correct elements', :js do
-      visit edit_project_path(project)
+    context 'for master' do
+      let(:role) { :master }
 
-      expect(page).to have_content('Git Large File Storage')
-      expect(page).to have_selector('input[name="project[lfs_enabled]"] + button', visible: true)
+      it 'displays the correct elements', :js do
+        visit edit_project_path(project)
+
+        expect(page).to have_content('Git Large File Storage')
+        expect(page).to have_selector('input[name="project[lfs_enabled]"] + button', visible: true)
+      end
     end
   end
 end
diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
index 4a9d1cb87e1..fe6fa55fa75 100644
--- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb
@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'User creates wiki page' do
+describe "User creates wiki page" do
   let(:user) { create(:user) }
 
   before do
@@ -10,67 +10,104 @@ describe 'User creates wiki page' do
     visit(project_wikis_path(project))
   end
 
-  context 'when wiki is empty' do
-    context 'in a user namespace' do
+  context "when wiki is empty" do
+    context "in a user namespace" do
       let(:project) { create(:project, namespace: user.namespace) }
 
-      it 'shows validation error message' do
-        page.within('.wiki-form') do
-          fill_in(:wiki_content, with: '')
-          click_on('Create page')
+      it "shows validation error message" do
+        page.within(".wiki-form") do
+          fill_in(:wiki_content, with: "")
+
+          click_on("Create page")
         end
 
-        expect(page).to have_content('The form contains the following error:')
-        expect(page).to have_content("Content can't be blank")
+        expect(page).to have_content("The form contains the following error:").and have_content("Content can't be blank")
+
+        page.within(".wiki-form") do
+          fill_in(:wiki_content, with: "[link test](test)")
 
-        page.within('.wiki-form') do
-          fill_in(:wiki_content, with: '[link test](test)')
-          click_on('Create page')
+          click_on("Create page")
         end
 
-        expect(page).to have_content('Home')
-        expect(page).to have_content('link test')
+        expect(page).to have_content("Home").and have_content("link test")
 
-        click_link('link test')
+        click_link("link test")
 
-        expect(page).to have_content('Create Page')
+        expect(page).to have_content("Create Page")
       end
 
-      it 'shows non-escaped link in the pages list', :js do
-        click_link('New page')
+      it "shows non-escaped link in the pages list", :js do
+        click_link("New page")
 
-        page.within('#modal-new-wiki') do
-          fill_in(:new_wiki_path, with: 'one/two/three-test')
-          click_on('Create page')
+        page.within("#modal-new-wiki") do
+          fill_in(:new_wiki_path, with: "one/two/three-test")
+
+          click_on("Create page")
         end
 
-        page.within('.wiki-form') do
-          fill_in(:wiki_content, with: 'wiki content')
-          click_on('Create page')
+        page.within(".wiki-form") do
+          fill_in(:wiki_content, with: "wiki content")
+
+          click_on("Create page")
         end
 
-        expect(current_path).to include('one/two/three-test')
+        expect(current_path).to include("one/two/three-test")
         expect(page).to have_xpath("//a[@href='/#{project.full_path}/wikis/one/two/three-test']")
       end
 
-      it 'has "Create home" as a commit message' do
-        expect(page).to have_field('wiki[message]', with: 'Create home')
+      it "has `Create home` as a commit message" do
+        expect(page).to have_field("wiki[message]", with: "Create home")
       end
 
-      it 'creates a page from the home page' do
-        fill_in(:wiki_content, with: 'My awesome wiki!')
+      it "creates a page from the home page" do
+        fill_in(:wiki_content, with: "[test](test)\n[GitLab API doc](api)\n[Rake tasks](raketasks)\n# Wiki header\n")
+        fill_in(:wiki_message, with: "Adding links to wiki")
+
+        page.within(".wiki-form") do
+          click_button("Create page")
+        end
+
+        expect(current_path).to eq(project_wiki_path(project, "home"))
+        expect(page).to have_content("test GitLab API doc Rake tasks Wiki header")
+                   .and have_content("Home")
+                   .and have_content("Last edited by #{user.name}")
+                   .and have_header_with_correct_id_and_link(1, "Wiki header", "wiki-header")
+
+        click_link("test")
 
-        page.within('.wiki-form') do
-          click_button('Create page')
+        expect(current_path).to eq(project_wiki_path(project, "test"))
+
+        page.within(:css, ".nav-text") do
+          expect(page).to have_content("Test").and have_content("Create Page")
+        end
+
+        click_link("Home")
+
+        expect(current_path).to eq(project_wiki_path(project, "home"))
+
+        click_link("GitLab API")
+
+        expect(current_path).to eq(project_wiki_path(project, "api"))
+
+        page.within(:css, ".nav-text") do
+          expect(page).to have_content("Create").and have_content("Api")
         end
 
-        expect(page).to have_content('Home')
-        expect(page).to have_content("Last edited by #{user.name}")
-        expect(page).to have_content('My awesome wiki!')
+        click_link("Home")
+
+        expect(current_path).to eq(project_wiki_path(project, "home"))
+
+        click_link("Rake tasks")
+
+        expect(current_path).to eq(project_wiki_path(project, "raketasks"))
+
+        page.within(:css, ".nav-text") do
+          expect(page).to have_content("Create").and have_content("Rake")
+        end
       end
 
-      it 'creates ASCII wiki with LaTeX blocks', :js do
-        stub_application_setting(plantuml_url: 'http://localhost', plantuml_enabled: true)
+      it "creates ASCII wiki with LaTeX blocks", :js do
+        stub_application_setting(plantuml_url: "http://localhost", plantuml_enabled: true)
 
         ascii_content = <<~MD
           :stem: latexmath
@@ -90,153 +127,164 @@ describe 'User creates wiki page' do
           stem:[2+2] is 4
         MD
 
-        find('#wiki_format option[value=asciidoc]').select_option
+        find("#wiki_format option[value=asciidoc]").select_option
+
         fill_in(:wiki_content, with: ascii_content)
 
-        page.within('.wiki-form') do
-          click_button('Create page')
+        page.within(".wiki-form") do
+          click_button("Create page")
         end
 
-        page.within '.wiki' do
-          expect(page).to have_selector('.katex', count: 3)
-          expect(page).to have_content('2+2 is 4')
+        page.within ".wiki" do
+          expect(page).to have_selector(".katex", count: 3).and have_content("2+2 is 4")
         end
       end
     end
 
-    context 'in a group namespace', :js do
+    context "in a group namespace", :js do
       let(:project) { create(:project, namespace: create(:group, :public)) }
 
-      it 'has "Create home" as a commit message' do
-        expect(page).to have_field('wiki[message]', with: 'Create home')
+      it "has `Create home` as a commit message" do
+        expect(page).to have_field("wiki[message]", with: "Create home")
       end
 
-      it 'creates a page from from the home page' do
-        page.within('.wiki-form') do
-          fill_in(:wiki_content, with: 'My awesome wiki!')
-          click_button('Create page')
+      it "creates a page from from the home page" do
+        page.within(".wiki-form") do
+          fill_in(:wiki_content, with: "My awesome wiki!")
+
+          click_button("Create page")
         end
 
-        expect(page).to have_content('Home')
-        expect(page).to have_content("Last edited by #{user.name}")
-        expect(page).to have_content('My awesome wiki!')
+        expect(page).to have_content("Home")
+                   .and have_content("Last edited by #{user.name}")
+                   .and have_content("My awesome wiki!")
       end
     end
   end
 
-  context 'when wiki is not empty', :js do
+  context "when wiki is not empty", :js do
     before do
-      create(:wiki_page, wiki: create(:project, namespace: user.namespace).wiki, attrs: { title: 'home', content: 'Home page' })
+      create(:wiki_page, wiki: create(:project, namespace: user.namespace).wiki, attrs: { title: "home", content: "Home page" })
     end
 
-    context 'in a user namespace' do
+    context "in a user namespace" do
       let(:project) { create(:project, namespace: user.namespace) }
 
-      context 'via the "new wiki page" page' do
-        it 'creates a page with a single word' do
-          click_link('New page')
+      context "via the `new wiki page` page" do
+        it "creates a page with a single word" do
+          click_link("New page")
 
-          page.within('#modal-new-wiki') do
-            fill_in(:new_wiki_path, with: 'foo')
-            click_button('Create page')
+          page.within("#modal-new-wiki") do
+            fill_in(:new_wiki_path, with: "foo")
+
+            click_button("Create page")
           end
 
           # Commit message field should have correct value.
-          expect(page).to have_field('wiki[message]', with: 'Create foo')
+          expect(page).to have_field("wiki[message]", with: "Create foo")
+
+          page.within(".wiki-form") do
+            fill_in(:wiki_content, with: "My awesome wiki!")
 
-          page.within('.wiki-form') do
-            fill_in(:wiki_content, with: 'My awesome wiki!')
-            click_button('Create page')
+            click_button("Create page")
           end
 
-          expect(page).to have_content('Foo')
-          expect(page).to have_content("Last edited by #{user.name}")
-          expect(page).to have_content('My awesome wiki!')
+          expect(page).to have_content("Foo")
+                     .and have_content("Last edited by #{user.name}")
+                     .and have_content("My awesome wiki!")
         end
 
-        it 'creates a page with spaces in the name' do
-          click_link('New page')
+        it "creates a page with spaces in the name" do
+          click_link("New page")
 
-          page.within('#modal-new-wiki') do
-            fill_in(:new_wiki_path, with: 'Spaces in the name')
-            click_button('Create page')
+          page.within("#modal-new-wiki") do
+            fill_in(:new_wiki_path, with: "Spaces in the name")
+
+            click_button("Create page")
           end
 
           # Commit message field should have correct value.
-          expect(page).to have_field('wiki[message]', with: 'Create spaces in the name')
+          expect(page).to have_field("wiki[message]", with: "Create spaces in the name")
+
+          page.within(".wiki-form") do
+            fill_in(:wiki_content, with: "My awesome wiki!")
 
-          page.within('.wiki-form') do
-            fill_in(:wiki_content, with: 'My awesome wiki!')
-            click_button('Create page')
+            click_button("Create page")
           end
 
-          expect(page).to have_content('Spaces in the name')
-          expect(page).to have_content("Last edited by #{user.name}")
-          expect(page).to have_content('My awesome wiki!')
+          expect(page).to have_content("Spaces in the name")
+                     .and have_content("Last edited by #{user.name}")
+                     .and have_content("My awesome wiki!")
         end
 
-        it 'creates a page with hyphens in the name' do
-          click_link('New page')
+        it "creates a page with hyphens in the name" do
+          click_link("New page")
 
-          page.within('#modal-new-wiki') do
-            fill_in(:new_wiki_path, with: 'hyphens-in-the-name')
-            click_button('Create page')
+          page.within("#modal-new-wiki") do
+            fill_in(:new_wiki_path, with: "hyphens-in-the-name")
+
+            click_button("Create page")
           end
 
           # Commit message field should have correct value.
-          expect(page).to have_field('wiki[message]', with: 'Create hyphens in the name')
+          expect(page).to have_field("wiki[message]", with: "Create hyphens in the name")
+
+          page.within(".wiki-form") do
+            fill_in(:wiki_content, with: "My awesome wiki!")
 
-          page.within('.wiki-form') do
-            fill_in(:wiki_content, with: 'My awesome wiki!')
-            click_button('Create page')
+            click_button("Create page")
           end
 
-          expect(page).to have_content('Hyphens in the name')
-          expect(page).to have_content("Last edited by #{user.name}")
-          expect(page).to have_content('My awesome wiki!')
+          expect(page).to have_content("Hyphens in the name")
+                     .and have_content("Last edited by #{user.name}")
+                     .and have_content("My awesome wiki!")
         end
       end
 
-      it 'shows the autocompletion dropdown' do
-        click_link('New page')
+      it "shows the autocompletion dropdown" do
+        click_link("New page")
 
-        page.within('#modal-new-wiki') do
-          fill_in(:new_wiki_path, with: 'test-autocomplete')
-          click_button('Create page')
+        page.within("#modal-new-wiki") do
+          fill_in(:new_wiki_path, with: "test-autocomplete")
+
+          click_button("Create page")
         end
 
-        page.within('.wiki-form') do
-          find('#wiki_content').native.send_keys('')
-          fill_in(:wiki_content, with: '@')
+        page.within(".wiki-form") do
+          find("#wiki_content").native.send_keys("")
+
+          fill_in(:wiki_content, with: "@")
         end
 
-        expect(page).to have_selector('.atwho-view')
+        expect(page).to have_selector(".atwho-view")
       end
     end
 
-    context 'in a group namespace' do
+    context "in a group namespace" do
       let(:project) { create(:project, namespace: create(:group, :public)) }
 
-      context 'via the "new wiki page" page' do
-        it 'creates a page' do
-          click_link('New page')
+      context "via the `new wiki page` page" do
+        it "creates a page" do
+          click_link("New page")
 
-          page.within('#modal-new-wiki') do
-            fill_in(:new_wiki_path, with: 'foo')
-            click_button('Create page')
+          page.within("#modal-new-wiki") do
+            fill_in(:new_wiki_path, with: "foo")
+
+            click_button("Create page")
           end
 
           # Commit message field should have correct value.
-          expect(page).to have_field('wiki[message]', with: 'Create foo')
+          expect(page).to have_field("wiki[message]", with: "Create foo")
+
+          page.within(".wiki-form") do
+            fill_in(:wiki_content, with: "My awesome wiki!")
 
-          page.within('.wiki-form') do
-            fill_in(:wiki_content, with: 'My awesome wiki!')
-            click_button('Create page')
+            click_button("Create page")
           end
 
-          expect(page).to have_content('Foo')
-          expect(page).to have_content("Last edited by #{user.name}")
-          expect(page).to have_content('My awesome wiki!')
+          expect(page).to have_content("Foo")
+                     .and have_content("Last edited by #{user.name}")
+                     .and have_content("My awesome wiki!")
         end
       end
     end
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index df65c2d2f83..b396e103345 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -181,4 +181,84 @@ feature 'Runners' do
       expect(page.find('.shared-runners-description')).to have_content('Disable shared Runners')
     end
   end
+
+  context 'group runners' do
+    background do
+      project.add_master(user)
+    end
+
+    given(:group) { create :group }
+
+    context 'as project and group master' do
+      background do
+        group.add_master(user)
+      end
+
+      context 'project with a group but no group runner' do
+        given(:project) { create :project, group: group }
+
+        scenario 'group runners are not available' do
+          visit runners_path(project)
+
+          expect(page).to have_content 'This group does not provide any group Runners yet.'
+
+          expect(page).to have_content 'Setup a group Runner manually'
+          expect(page).not_to have_content 'Ask your group master to setup a group Runner.'
+        end
+      end
+    end
+
+    context 'as project master' do
+      context 'project without a group' do
+        given(:project) { create :project }
+
+        scenario 'group runners are not available' do
+          visit runners_path(project)
+
+          expect(page).to have_content 'This project does not belong to a group and can therefore not make use of group Runners.'
+        end
+      end
+
+      context 'project with a group but no group runner' do
+        given(:group) { create :group }
+        given(:project) { create :project, group: group }
+
+        scenario 'group runners are not available' do
+          visit runners_path(project)
+
+          expect(page).to have_content 'This group does not provide any group Runners yet.'
+
+          expect(page).not_to have_content 'Setup a group Runner manually'
+          expect(page).to have_content 'Ask your group master to setup a group Runner.'
+        end
+      end
+
+      context 'project with a group and a group runner' do
+        given(:group) { create :group }
+        given(:project) { create :project, group: group }
+        given!(:ci_runner) { create :ci_runner, groups: [group], description: 'group-runner' }
+
+        scenario 'group runners are available' do
+          visit runners_path(project)
+
+          expect(page).to have_content 'Available group Runners : 1'
+          expect(page).to have_content 'group-runner'
+        end
+
+        scenario 'group runners may be disabled for a project' do
+          visit runners_path(project)
+
+          click_on 'Disable group Runners'
+
+          expect(page).to have_content 'Enable group Runners'
+          expect(project.reload.group_runners_enabled).to be false
+
+          click_on 'Enable group Runners'
+
+          expect(page).to have_content 'Disable group Runners'
+          expect(project.reload.group_runners_enabled).to be true
+        end
+      end
+    end
+  end
 end
diff --git a/spec/features/users/active_sessions_spec.rb b/spec/features/users/active_sessions_spec.rb
new file mode 100644
index 00000000000..631d7e3bced
--- /dev/null
+++ b/spec/features/users/active_sessions_spec.rb
@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+feature 'Active user sessions', :clean_gitlab_redis_shared_state do
+  scenario 'Successful login adds a new active user login' do
+    now = Time.zone.parse('2018-03-12 09:06')
+    Timecop.freeze(now) do
+      user = create(:user)
+      gitlab_sign_in(user)
+      expect(current_path).to eq root_path
+
+      sessions = ActiveSession.list(user)
+      expect(sessions.count).to eq 1
+
+      # refresh the current page updates the updated_at
+      Timecop.freeze(now + 1.minute) do
+        visit current_path
+
+        sessions = ActiveSession.list(user)
+        expect(sessions.first).to have_attributes(
+          created_at: Time.zone.parse('2018-03-12 09:06'),
+          updated_at: Time.zone.parse('2018-03-12 09:07')
+        )
+      end
+    end
+  end
+
+  scenario 'Successful login cleans up obsolete entries' do
+    user = create(:user)
+
+    Gitlab::Redis::SharedState.with do |redis|
+      redis.sadd("session:lookup:user:gitlab:#{user.id}", '59822c7d9fcdfa03725eff41782ad97d')
+    end
+
+    gitlab_sign_in(user)
+
+    Gitlab::Redis::SharedState.with do |redis|
+      expect(redis.smembers("session:lookup:user:gitlab:#{user.id}")).not_to include '59822c7d9fcdfa03725eff41782ad97d'
+    end
+  end
+
+  scenario 'Sessionless login does not clean up obsolete entries' do
+    user = create(:user)
+    personal_access_token = create(:personal_access_token, user: user)
+
+    Gitlab::Redis::SharedState.with do |redis|
+      redis.sadd("session:lookup:user:gitlab:#{user.id}", '59822c7d9fcdfa03725eff41782ad97d')
+    end
+
+    visit user_path(user, :atom, private_token: personal_access_token.token)
+    expect(page.status_code).to eq 200
+
+    Gitlab::Redis::SharedState.with do |redis|
+      expect(redis.smembers("session:lookup:user:gitlab:#{user.id}")).to include '59822c7d9fcdfa03725eff41782ad97d'
+    end
+  end
+
+  scenario 'Logout deletes the active user login' do
+    user = create(:user)
+    gitlab_sign_in(user)
+    expect(current_path).to eq root_path
+
+    expect(ActiveSession.list(user).count).to eq 1
+
+    gitlab_sign_out
+    expect(current_path).to eq new_user_session_path
+
+    expect(ActiveSession.list(user)).to be_empty
+  end
+end
diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb
index 9e10bfb2adc..94a2b289e64 100644
--- a/spec/features/users/login_spec.rb
+++ b/spec/features/users/login_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 feature 'Login' do
+  include TermsHelper
+
   scenario 'Successful user signin invalidates password reset token' do
     user = create(:user)
 
@@ -399,4 +401,41 @@ feature 'Login' do
       expect(page).to have_selector('.tab-pane.active', count: 1)
     end
   end
+
+  context 'when terms are enforced' do
+    let(:user) { create(:user) }
+
+    before do
+      enforce_terms
+    end
+
+    it 'asks to accept the terms on first login' do
+      visit new_user_session_path
+
+      fill_in 'user_login', with: user.email
+      fill_in 'user_password', with: '12345678'
+
+      click_button 'Sign in'
+
+      expect_to_be_on_terms_page
+
+      click_button 'Accept terms'
+
+      expect(current_path).to eq(root_path)
+      expect(page).not_to have_content('You are already signed in.')
+    end
+
+    it 'does not ask for terms when the user already accepted them' do
+      accept_terms(user)
+
+      visit new_user_session_path
+
+      fill_in 'user_login', with: user.email
+      fill_in 'user_password', with: '12345678'
+
+      click_button 'Sign in'
+
+      expect(current_path).to eq(root_path)
+    end
+  end
 end
diff --git a/spec/features/users/signup_spec.rb b/spec/features/users/signup_spec.rb
index 5d539f0ccbe..b5bd5c505f2 100644
--- a/spec/features/users/signup_spec.rb
+++ b/spec/features/users/signup_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe 'Signup' do
+  include TermsHelper
+
   let(:new_user) { build_stubbed(:user) }
 
   describe 'username validation', :js do
@@ -132,4 +134,27 @@ describe 'Signup' do
       expect(page.body).not_to match(/#{new_user.password}/)
     end
   end
+
+  context 'when terms are enforced' do
+    before do
+      enforce_terms
+    end
+
+    it 'asks the user to accept terms before going to the dashboard' do
+      visit root_path
+
+      fill_in 'new_user_name',                with: new_user.name
+      fill_in 'new_user_username',            with: new_user.username
+      fill_in 'new_user_email',               with: new_user.email
+      fill_in 'new_user_email_confirmation',  with: new_user.email
+      fill_in 'new_user_password',            with: new_user.password
+      click_button "Register"
+
+      expect_to_be_on_terms_page
+
+      click_button 'Accept terms'
+
+      expect(current_path).to eq dashboard_projects_path
+    end
+  end
 end
diff --git a/spec/features/users/terms_spec.rb b/spec/features/users/terms_spec.rb
new file mode 100644
index 00000000000..bf6b5fa3d6a
--- /dev/null
+++ b/spec/features/users/terms_spec.rb
@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe 'Users > Terms' do
+  include TermsHelper
+
+  let(:user) { create(:user) }
+  let!(:term) { create(:term, terms: 'By accepting, you promise to be nice!') }
+
+  before do
+    stub_env('IN_MEMORY_APPLICATION_SETTINGS', 'false')
+    sign_in(user)
+  end
+
+  it 'shows the terms' do
+    visit terms_path
+
+    expect(page).to have_content('By accepting, you promise to be nice!')
+  end
+
+  context 'declining the terms' do
+    it 'returns the user to the app' do
+      visit terms_path
+
+      click_button 'Decline and sign out'
+
+      expect(page).not_to have_content(term.terms)
+      expect(user.reload.terms_accepted?).to be(false)
+    end
+  end
+
+  context 'accepting the terms' do
+    it 'returns the user to the app' do
+      visit terms_path
+
+      click_button 'Accept terms'
+
+      expect(page).not_to have_content(term.terms)
+      expect(user.reload.terms_accepted?).to be(true)
+    end
+  end
+
+  context 'terms were enforced while session is active', :js do
+    let(:project) { create(:project) }
+
+    before do
+      project.add_developer(user)
+    end
+
+    it 'redirects to terms and back to where the user was going'  do
+      visit project_path(project)
+
+      enforce_terms
+
+      within('.nav-sidebar') do
+        click_link 'Issues'
+      end
+
+      expect_to_be_on_terms_page
+
+      click_button('Accept terms')
+
+      expect(current_path).to eq(project_issues_path(project))
+    end
+
+    it 'redirects back to the page the user was trying to save' do
+      visit new_project_issue_path(project)
+
+      fill_in :issue_title, with: 'Hello world, a new issue'
+      fill_in :issue_description, with: "We don't want to lose what the user typed"
+
+      enforce_terms
+
+      click_button 'Submit issue'
+
+      expect(current_path).to eq(terms_path)
+
+      click_button('Accept terms')
+
+      expect(current_path).to eq(new_project_issue_path(project))
+      expect(find_field('issue_title').value).to eq('Hello world, a new issue')
+      expect(find_field('issue_description').value).to eq("We don't want to lose what the user typed")
+    end
+  end
+end