Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled

27 files changed, 804 insertions, 338 deletions

diff --git a/spec/features/admin/admin_appearance_spec.rb b/spec/features/admin/admin_appearance_spec.rb
index 5f3a37c1dcc..d91dcf76191 100644
--- a/spec/features/admin/admin_appearance_spec.rb
+++ b/spec/features/admin/admin_appearance_spec.rb
@@ -9,6 +9,7 @@ feature 'Admin Appearance' do
 
     fill_in 'appearance_title', with: 'MyCompany'
     fill_in 'appearance_description', with: 'dev server'
+    fill_in 'appearance_new_project_guidelines', with: 'Custom project guidelines'
     click_button 'Save'
 
     expect(current_path).to eq admin_appearances_path
@@ -16,21 +17,39 @@ feature 'Admin Appearance' do
 
     expect(page).to have_field('appearance_title', with: 'MyCompany')
     expect(page).to have_field('appearance_description', with: 'dev server')
+    expect(page).to have_field('appearance_new_project_guidelines', with: 'Custom project guidelines')
     expect(page).to have_content 'Last edit'
   end
 
-  scenario 'Preview appearance' do
+  scenario 'Preview sign-in page appearance' do
     sign_in(create(:admin))
 
     visit admin_appearances_path
-    click_link "Preview"
+    click_link "Sign-in page"
 
-    expect_page_has_custom_appearance(appearance)
+    expect_custom_sign_in_appearance(appearance)
+  end
+
+  scenario 'Preview new project page appearance' do
+    sign_in(create(:admin))
+
+    visit admin_appearances_path
+    click_link "New project page"
+
+    expect_custom_new_project_appearance(appearance)
   end
 
   scenario 'Custom sign-in page' do
     visit new_user_session_path
-    expect_page_has_custom_appearance(appearance)
+
+    expect_custom_sign_in_appearance(appearance)
+  end
+
+  scenario 'Custom new project page' do
+    sign_in create(:user)
+    visit new_project_path
+
+    expect_custom_new_project_appearance(appearance)
   end
 
   scenario 'Appearance logo' do
@@ -57,11 +76,15 @@ feature 'Admin Appearance' do
     expect(page).not_to have_css(header_logo_selector)
   end
 
-  def expect_page_has_custom_appearance(appearance)
+  def expect_custom_sign_in_appearance(appearance)
     expect(page).to have_content appearance.title
     expect(page).to have_content appearance.description
   end
 
+  def expect_custom_new_project_appearance(appearance)
+    expect(page).to have_content appearance.new_project_guidelines
+  end
+
   def logo_selector
     '//img[data-src^="/uploads/-/system/appearance/logo"]'
   end
diff --git a/spec/features/admin/admin_health_check_spec.rb b/spec/features/admin/admin_health_check_spec.rb
index 4430fc15501..ac3392b49f9 100644
--- a/spec/features/admin/admin_health_check_spec.rb
+++ b/spec/features/admin/admin_health_check_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature "Admin Health Check", :feature, :broken_storage do
+feature "Admin Health Check", :feature do
   include StubENV
 
   before do
@@ -36,6 +36,7 @@ feature "Admin Health Check", :feature, :broken_storage do
 
   context 'when services are up' do
     before do
+      stub_storage_settings({}) # Hide the broken storage
       visit admin_health_check_path
     end
 
@@ -56,10 +57,8 @@ feature "Admin Health Check", :feature, :broken_storage do
     end
   end
 
-  context 'with repository storage failures' do
+  context 'with repository storage failures', :broken_storage do
     before do
-      # Track a failure
-      Gitlab::Git::Storage::CircuitBreaker.for_storage('broken').perform { nil } rescue nil
       visit admin_health_check_path
     end
 
@@ -67,9 +66,10 @@ feature "Admin Health Check", :feature, :broken_storage do
       hostname = Gitlab::Environment.hostname
       maximum_failures = Gitlab::CurrentSettings.current_application_settings
                            .circuitbreaker_failure_count_threshold
+      number_of_failures = maximum_failures + 1
 
-      expect(page).to have_content('broken: failed storage access attempt on host:')
-      expect(page).to have_content("#{hostname}: 1 of #{maximum_failures} failures.")
+      expect(page).to have_content("broken: #{number_of_failures} failed storage access attempts:")
+      expect(page).to have_content("#{hostname}: #{number_of_failures} of #{maximum_failures} failures.")
     end
 
     it 'allows resetting storage failures' do
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 98586ddbd81..c870910c8ea 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -89,7 +89,7 @@ describe 'Commits' do
 
         context 'Download artifacts' do
           before do
-            build.update_attributes(artifacts_file: artifacts_file)
+            build.update_attributes(legacy_artifacts_file: artifacts_file)
           end
 
           it do
@@ -146,7 +146,7 @@ describe 'Commits' do
       context "when logged as reporter" do
         before do
           project.team << [user, :reporter]
-          build.update_attributes(artifacts_file: artifacts_file)
+          build.update_attributes(legacy_artifacts_file: artifacts_file)
           visit pipeline_path(pipeline)
         end
 
@@ -168,7 +168,7 @@ describe 'Commits' do
           project.update(
             visibility_level: Gitlab::VisibilityLevel::INTERNAL,
             public_builds: false)
-          build.update_attributes(artifacts_file: artifacts_file)
+          build.update_attributes(legacy_artifacts_file: artifacts_file)
           visit pipeline_path(pipeline)
         end
 
diff --git a/spec/features/dashboard/todos/todos_spec.rb b/spec/features/dashboard/todos/todos_spec.rb
index 6f916078b1a..94133c62b5c 100644
--- a/spec/features/dashboard/todos/todos_spec.rb
+++ b/spec/features/dashboard/todos/todos_spec.rb
@@ -13,7 +13,7 @@ feature 'Dashboard Todos' do
     end
 
     it 'shows "All done" message' do
-      expect(page).to have_content 'Todos let you see what you should do next.'
+      expect(page).to have_content 'Todos let you see what you should do next'
     end
   end
 
diff --git a/spec/features/groups/labels/user_sees_links_to_issuables.rb b/spec/features/groups/labels/user_sees_links_to_issuables.rb
new file mode 100644
index 00000000000..5d6290d2109
--- /dev/null
+++ b/spec/features/groups/labels/user_sees_links_to_issuables.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+feature 'Groups > Labels > User sees links to issuables' do
+  set(:group) { create(:group, :public) }
+
+  before do
+    create(:group_label, group: group, title: 'bug')
+    visit group_labels_path(group)
+  end
+
+  scenario 'shows links to MRs and issues' do
+    expect(page).to have_link('view merge requests')
+    expect(page).to have_link('view open issues')
+  end
+end
diff --git a/spec/features/groups/members/manage_members.rb b/spec/features/groups/members/manage_members.rb
index da1e17225db..21f7b4999ad 100644
--- a/spec/features/groups/members/manage_members.rb
+++ b/spec/features/groups/members/manage_members.rb
@@ -38,6 +38,27 @@ feature 'Groups > Members > Manage members' do
     end
   end
 
+  scenario 'do not disclose email addresses', :js do
+    group.add_owner(user1)
+    create(:user, email: 'undisclosed_email@gitlab.com', name: "Jane 'invisible' Doe")
+
+    visit group_group_members_path(group)
+
+    find('.select2-container').click
+    select_input = find('.select2-input')
+
+    select_input.send_keys('@gitlab.com')
+    wait_for_requests
+
+    expect(page).to have_content('No matches found')
+
+    select_input.native.clear
+    select_input.send_keys('undisclosed_email@gitlab.com')
+    wait_for_requests
+
+    expect(page).to have_content("Jane 'invisible' Doe")
+  end
+
   scenario 'remove user from group', :js do
     group.add_owner(user1)
     group.add_developer(user2)
diff --git a/spec/features/issuables/discussion_lock_spec.rb b/spec/features/issuables/discussion_lock_spec.rb
index 7ea29ff252b..ecbe51a7bc2 100644
--- a/spec/features/issuables/discussion_lock_spec.rb
+++ b/spec/features/issuables/discussion_lock_spec.rb
@@ -14,7 +14,7 @@ describe 'Discussion Lock', :js do
       project.add_developer(user)
     end
 
-    context 'when the discussion is unlocked' do
+    context 'when the discussion is   unlocked' do
       it 'the user can lock the issue' do
         visit project_issue_path(project, issue)
 
diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index 95d637265e0..6a9a80235c1 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -15,7 +15,7 @@ feature 'GFM autocomplete', :js do
   end
 
   it 'updates issue descripton with GFM reference' do
-    find('.issuable-edit').click
+    find('.js-issuable-edit').click
 
     simulate_input('#issue-description', "@#{user.name[0...3]}")
 
@@ -220,6 +220,89 @@ feature 'GFM autocomplete', :js do
     end
   end
 
+  # This context has jsut one example in each contexts in order to improve spec performance.
+  context 'labels' do
+    let!(:backend)          { create(:label, project: project, title: 'backend') }
+    let!(:bug)              { create(:label, project: project, title: 'bug') }
+    let!(:feature_proposal) { create(:label, project: project, title: 'feature proposal') }
+
+    context 'when no labels are assigned' do
+      it 'shows labels' do
+        note = find('#note-body')
+
+        # It should show all the labels on "~".
+        type(note, '~')
+        expect_labels(shown: [backend, bug, feature_proposal])
+
+        # It should show all the labels on "/label ~".
+        type(note, '/label ~')
+        expect_labels(shown: [backend, bug, feature_proposal])
+
+        # It should show all the labels on "/relabel ~".
+        type(note, '/relabel ~')
+        expect_labels(shown: [backend, bug, feature_proposal])
+
+        # It should show no labels on "/unlabel ~".
+        type(note, '/unlabel ~')
+        expect_labels(not_shown: [backend, bug, feature_proposal])
+      end
+    end
+
+    context 'when some labels are assigned' do
+      before do
+        issue.labels << [backend]
+      end
+
+      it 'shows labels' do
+        note = find('#note-body')
+
+        # It should show all the labels on "~".
+        type(note, '~')
+        expect_labels(shown: [backend, bug, feature_proposal])
+
+        # It should show only unset labels on "/label ~".
+        type(note, '/label ~')
+        expect_labels(shown: [bug, feature_proposal], not_shown: [backend])
+
+        # It should show all the labels on "/relabel ~".
+        type(note, '/relabel ~')
+        expect_labels(shown: [backend, bug, feature_proposal])
+
+        # It should show only set labels on "/unlabel ~".
+        type(note, '/unlabel ~')
+        expect_labels(shown: [backend], not_shown: [bug, feature_proposal])
+      end
+    end
+
+    context 'when all labels are assigned' do
+      before do
+        issue.labels << [backend, bug, feature_proposal]
+      end
+
+      it 'shows labels' do
+        note = find('#note-body')
+
+        # It should show all the labels on "~".
+        type(note, '~')
+        expect_labels(shown: [backend, bug, feature_proposal])
+
+        # It should show no labels on "/label ~".
+        type(note, '/label ~')
+        expect_labels(not_shown: [backend, bug, feature_proposal])
+
+        # It should show all the labels on "/relabel ~".
+        type(note, '/relabel ~')
+        expect_labels(shown: [backend, bug, feature_proposal])
+
+        # It should show all the labels on "/unlabel ~".
+        type(note, '/unlabel ~')
+        expect_labels(shown: [backend, bug, feature_proposal])
+      end
+    end
+  end
+
+  private
+
   def expect_to_wrap(should_wrap, item, note, value)
     expect(item).to have_content(value)
     expect(item).not_to have_content("\"#{value}\"")
@@ -232,4 +315,27 @@ feature 'GFM autocomplete', :js do
       expect(note.value).not_to include("\"#{value}\"")
     end
   end
+
+  def expect_labels(shown: nil, not_shown: nil)
+    page.within('.atwho-container') do
+      if shown
+        expect(page).to have_selector('.atwho-view li', count: shown.size)
+        shown.each { |label| expect(page).to have_content(label.title) }
+      end
+
+      if not_shown
+        expect(page).not_to have_selector('.atwho-view li') unless shown
+        not_shown.each { |label| expect(page).not_to have_content(label.title) }
+      end
+    end
+  end
+
+  # `note` is a textarea where the given text should be typed.
+  # We don't want to find it each time this function gets called.
+  def type(note, text)
+    page.within('.timeline-content-form') do
+      note.set('')
+      note.native.send_keys(text)
+    end
+  end
 end
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index b9af77f918a..852d9e368aa 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -365,16 +365,16 @@ describe 'Issues' do
     end
 
     it 'changes incoming email address token', :js do
-      find('.issue-email-modal-btn').click
-      previous_token = find('input#issue_email').value
+      find('.issuable-email-modal-btn').click
+      previous_token = find('input#issuable_email').value
       find('.incoming-email-token-reset').click
 
       wait_for_requests
 
-      expect(page).to have_no_field('issue_email', with: previous_token)
-      new_token = project1.new_issue_address(user.reload)
+      expect(page).to have_no_field('issuable_email', with: previous_token)
+      new_token = project1.new_issuable_address(user.reload, 'issue')
       expect(page).to have_field(
-        'issue_email',
+        'issuable_email',
         with: new_token
       )
     end
@@ -630,8 +630,8 @@ describe 'Issues' do
       end
 
       it 'click the button to show modal for the new email' do
-        page.within '#issue-email-modal' do
-          email = project.new_issue_address(user)
+        page.within '#issuable-email-modal' do
+          email = project.new_issuable_address(user, 'issue')
 
           expect(page).to have_selector("input[value='#{email}']")
         end
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index cc1b187ff54..e285befc66f 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -207,8 +207,9 @@ describe 'GitLab Markdown' do
   before do
     @feat = MarkdownFeature.new
 
-    # `markdown` helper expects a `@project` variable
+    # `markdown` helper expects a `@project` and `@group` variable
     @project = @feat.project
+    @group = @feat.group
   end
 
   context 'default pipeline' do
diff --git a/spec/features/merge_requests/image_diff_notes.rb b/spec/features/merge_requests/image_diff_notes.rb
index 3c53b51e330..021c4e03428 100644
--- a/spec/features/merge_requests/image_diff_notes.rb
+++ b/spec/features/merge_requests/image_diff_notes.rb
@@ -185,6 +185,18 @@ feature 'image diff notes', :js do
       expect(page).to have_content(diff_note.note)
     end
   end
+
+  describe 'image view modes' do
+    before do
+      visit project_commit_path(project, '2f63565e7aac07bcdadb654e253078b727143ec4')
+    end
+
+    it 'resizes image in onion skin view mode' do
+      find('.view-modes-menu .onion-skin').click
+
+      expect(find('.onion-skin-frame')['style']).to match('width: 228px; height: 240px;')
+    end
+  end
 end
 
 def create_image_diff_note
diff --git a/spec/features/merge_requests/mini_pipeline_graph_spec.rb b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
index bac56270362..93c5e945453 100644
--- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb
+++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
@@ -28,14 +28,14 @@ feature 'Mini Pipeline Graph', :js do
     let(:artifacts_file2) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png') }
 
     before do
-      create(:ci_build, pipeline: pipeline, artifacts_file: artifacts_file1)
+      create(:ci_build, pipeline: pipeline, legacy_artifacts_file: artifacts_file1)
       create(:ci_build, pipeline: pipeline, when: 'manual')
     end
 
     it 'avoids repeated database queries' do
       before = ActiveRecord::QueryRecorder.new { visit_merge_request(:json) }
 
-      create(:ci_build, pipeline: pipeline, artifacts_file: artifacts_file2)
+      create(:ci_build, pipeline: pipeline, legacy_artifacts_file: artifacts_file2)
       create(:ci_build, pipeline: pipeline, when: 'manual')
 
       after = ActiveRecord::QueryRecorder.new { visit_merge_request(:json) }
diff --git a/spec/features/merge_requests/pipelines_spec.rb b/spec/features/merge_requests/pipelines_spec.rb
index a3fcc27cab0..307c860eac4 100644
--- a/spec/features/merge_requests/pipelines_spec.rb
+++ b/spec/features/merge_requests/pipelines_spec.rb
@@ -20,10 +20,14 @@ feature 'Pipelines for Merge Requests', :js do
       end
 
       before do
-        visit project_merge_request_path(project, merge_request)
+        merge_request.update_attribute(:head_pipeline_id, pipeline.id)
       end
 
       scenario 'user visits merge request pipelines tab' do
+        visit project_merge_request_path(project, merge_request)
+
+        expect(page.find('.ci-widget')).to have_content('pending')
+
         page.within('.merge-request-tabs') do
           click_link('Pipelines')
         end
@@ -31,6 +35,15 @@ feature 'Pipelines for Merge Requests', :js do
 
         expect(page).to have_selector('.stage-cell')
       end
+
+      scenario 'pipeline sha does not equal last commit sha' do
+        pipeline.update_attribute(:sha, '19e2e9b4ef76b422ce1154af39a91323ccc57434')
+        visit project_merge_request_path(project, merge_request)
+        wait_for_requests
+
+        expect(page.find('.ci-widget')).to have_content(
+          'Could not connect to the CI server. Please check your settings and try again')
+      end
     end
 
     context 'without pipelines' do
diff --git a/spec/features/merge_requests/versions_spec.rb b/spec/features/merge_requests/versions_spec.rb
index 29f95039af8..482f2e51c8b 100644
--- a/spec/features/merge_requests/versions_spec.rb
+++ b/spec/features/merge_requests/versions_spec.rb
@@ -6,18 +6,47 @@ feature 'Merge Request versions', :js do
   let!(:merge_request_diff1) { merge_request.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
   let!(:merge_request_diff2) { merge_request.merge_request_diffs.create(head_commit_sha: nil) }
   let!(:merge_request_diff3) { merge_request.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
+  let!(:params) { Hash.new }
 
   before do
     sign_in(create(:admin))
-    visit diffs_project_merge_request_path(project, merge_request)
+    visit diffs_project_merge_request_path(project, merge_request, params)
   end
 
-  it 'show the latest version of the diff' do
-    page.within '.mr-version-dropdown' do
-      expect(page).to have_content 'latest version'
+  shared_examples 'allows commenting' do |file_id:, line_code:, comment:|
+    it do
+      diff_file_selector = ".diff-file[id='#{file_id}']"
+      line_code = "#{file_id}_#{line_code}"
+
+      page.within(diff_file_selector) do
+        find(".line_holder[id='#{line_code}'] td:nth-of-type(1)").hover
+        find(".line_holder[id='#{line_code}'] button").click
+
+        page.within("form[data-line-code='#{line_code}']") do
+          fill_in "note[note]", with: comment
+          find(".js-comment-button").click
+        end
+
+        wait_for_requests
+
+        expect(page).to have_content(comment)
+      end
     end
+  end
 
-    expect(page).to have_content '8 changed files'
+  describe 'compare with the latest version' do
+    it 'show the latest version of the diff' do
+      page.within '.mr-version-dropdown' do
+        expect(page).to have_content 'latest version'
+      end
+
+      expect(page).to have_content '8 changed files'
+    end
+
+    it_behaves_like 'allows commenting',
+                    file_id: '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44',
+                    line_code: '1_1',
+                    comment: 'Typo, please fix.'
   end
 
   describe 'switch between versions' do
@@ -62,24 +91,10 @@ feature 'Merge Request versions', :js do
       expect(page).to have_css(".diffs .notes[data-discussion-id='#{outdated_diff_note.discussion_id}']")
     end
 
-    it 'allows commenting' do
-      diff_file_selector = ".diff-file[id='7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44']"
-      line_code = '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44_2_2'
-
-      page.within(diff_file_selector) do
-        find(".line_holder[id='#{line_code}'] td:nth-of-type(1)").hover
-        find(".line_holder[id='#{line_code}'] button").click
-
-        page.within("form[data-line-code='#{line_code}']") do
-          fill_in "note[note]", with: "Typo, please fix"
-          find(".js-comment-button").click
-        end
-
-        wait_for_requests
-
-        expect(page).to have_content("Typo, please fix")
-      end
-    end
+    it_behaves_like 'allows commenting',
+                    file_id: '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44',
+                    line_code: '2_2',
+                    comment: 'Typo, please fix.'
   end
 
   describe 'compare with older version' do
@@ -132,25 +147,6 @@ feature 'Merge Request versions', :js do
       expect(page).to have_css(".diffs .notes[data-discussion-id='#{outdated_diff_note.discussion_id}']")
     end
 
-    it 'allows commenting' do
-      diff_file_selector = ".diff-file[id='7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44']"
-      line_code = '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44_4_4'
-
-      page.within(diff_file_selector) do
-        find(".line_holder[id='#{line_code}'] td:nth-of-type(1)").hover
-        find(".line_holder[id='#{line_code}'] button").click
-
-        page.within("form[data-line-code='#{line_code}']") do
-          fill_in "note[note]", with: "Typo, please fix"
-          find(".js-comment-button").click
-        end
-
-        wait_for_requests
-
-        expect(page).to have_content("Typo, please fix")
-      end
-    end
-
     it 'show diff between new and old version' do
       expect(page).to have_content '4 changed files with 15 additions and 6 deletions'
     end
@@ -162,6 +158,11 @@ feature 'Merge Request versions', :js do
       end
       expect(page).to have_content '8 changed files'
     end
+
+    it_behaves_like 'allows commenting',
+                    file_id: '7445606fbf8f3683cd42bdc54b05d7a0bc2dfc44',
+                    line_code: '4_4',
+                    comment: 'Typo, please fix.'
   end
 
   describe 'compare with same version' do
@@ -210,4 +211,24 @@ feature 'Merge Request versions', :js do
       expect(page).to have_content '0 changed files'
     end
   end
+
+  describe 'scoped in a commit' do
+    let(:params) { { commit_id: '570e7b2abdd848b95f2f578043fc23bd6f6fd24d' } }
+
+    before do
+      wait_for_requests
+    end
+
+    it 'should only show diffs from the commit' do
+      diff_commit_ids = find_all('.diff-file [data-commit-id]').map {|diff| diff['data-commit-id']}
+
+      expect(diff_commit_ids).not_to be_empty
+      expect(diff_commit_ids).to all(eq(params[:commit_id]))
+    end
+
+    it_behaves_like 'allows commenting',
+                    file_id: '2f6fcd96b88b36ce98c38da085c795a27d92a3dd',
+                    line_code: '6_6',
+                    comment: 'Typo, please fix.'
+  end
 end
diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb
index 2bad3b02250..3ee094c216e 100644
--- a/spec/features/merge_requests/widget_spec.rb
+++ b/spec/features/merge_requests/widget_spec.rb
@@ -63,6 +63,18 @@ describe 'Merge request', :js do
       expect(page).to have_selector('.accept-merge-request')
       expect(find('.accept-merge-request')['disabled']).not_to be(true)
     end
+
+    it 'allows me to merge, see cherry-pick modal and load branches list' do
+      wait_for_requests
+      click_button 'Merge'
+
+      wait_for_requests
+      click_link 'Cherry-pick'
+      page.find('.js-project-refs-dropdown').click
+      wait_for_requests
+
+      expect(page.all('.js-cherry-pick-form .dropdown-content li').size).to be > 1
+    end
   end
 
   context 'view merge request with external CI service' do
diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb
new file mode 100644
index 00000000000..b34cd061ec6
--- /dev/null
+++ b/spec/features/projects/clusters/applications_spec.rb
@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+feature 'Clusters Applications', :js do
+  include GoogleApi::CloudPlatformHelpers
+
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    sign_in(user)
+  end
+
+  describe 'Installing applications' do
+    before do
+      visit project_cluster_path(project, cluster)
+    end
+
+    context 'when cluster is being created' do
+      let(:cluster) { create(:cluster, :providing_by_gcp, projects: [project])}
+
+      scenario 'user is unable to install applications' do
+        page.within('.js-cluster-application-row-helm') do
+          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+          expect(page.find(:css, '.js-cluster-application-install-button').text).to eq('Install')
+        end
+      end
+    end
+
+    context 'when cluster is created' do
+      let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project])}
+
+      scenario 'user can install applications' do
+        page.within('.js-cluster-application-row-helm') do
+          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to be_nil
+          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+        end
+      end
+
+      context 'when user installs Helm' do
+        before do
+          allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
+
+          page.within('.js-cluster-application-row-helm') do
+            page.find(:css, '.js-cluster-application-install-button').click
+          end
+        end
+
+        it 'he sees status transition' do
+          page.within('.js-cluster-application-row-helm') do
+            # FE sends request and gets the response, then the buttons is "Install"
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+
+            Clusters::Cluster.last.application_helm.make_installing!
+
+            # FE starts polling and update the buttons to "Installing"
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
+
+            Clusters::Cluster.last.application_helm.make_installed!
+
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
+          end
+
+          expect(page).to have_content('Helm Tiller was successfully installed on your cluster')
+        end
+      end
+
+      context 'when user installs Ingress' do
+        context 'when user installs application: Ingress' do
+          before do
+            allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
+
+            create(:cluster_applications_helm, :installed, cluster: cluster)
+
+            page.within('.js-cluster-application-row-ingress') do
+              page.find(:css, '.js-cluster-application-install-button').click
+            end
+          end
+
+          it 'he sees status transition' do
+            page.within('.js-cluster-application-row-ingress') do
+              # FE sends request and gets the response, then the buttons is "Install"
+              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+
+              Clusters::Cluster.last.application_ingress.make_installing!
+
+              # FE starts polling and update the buttons to "Installing"
+              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
+
+              Clusters::Cluster.last.application_ingress.make_installed!
+
+              expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+              expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
+            end
+
+            expect(page).to have_content('Ingress was successfully installed on your cluster')
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
new file mode 100644
index 00000000000..67b8901f8fb
--- /dev/null
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -0,0 +1,138 @@
+require 'spec_helper'
+
+feature 'Gcp Cluster', :js do
+  include GoogleApi::CloudPlatformHelpers
+
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    gitlab_sign_in(user)
+    allow(Projects::ClustersController).to receive(:STATUS_POLLING_INTERVAL) { 100 }
+  end
+
+  context 'when user has signed with Google' do
+    before do
+      allow_any_instance_of(Projects::Clusters::GcpController)
+        .to receive(:token_in_session).and_return('token')
+      allow_any_instance_of(Projects::Clusters::GcpController)
+        .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s)
+    end
+
+    context 'when user does not have a cluster and visits cluster index page' do
+      before do
+        visit project_clusters_path(project)
+
+        click_link 'Add cluster'
+        click_link 'Create on GKE'
+      end
+
+      context 'when user filled form with valid parameters' do
+        before do
+          allow_any_instance_of(GoogleApi::CloudPlatform::Client)
+            .to receive(:projects_zones_clusters_create) do
+            OpenStruct.new(
+              self_link: 'projects/gcp-project-12345/zones/us-central1-a/operations/ope-123',
+              status: 'RUNNING'
+            )
+          end
+
+          allow(WaitForClusterCreationWorker).to receive(:perform_in).and_return(nil)
+
+          fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123'
+          fill_in 'cluster_name', with: 'dev-cluster'
+          click_button 'Create cluster'
+        end
+
+        it 'user sees a cluster details page and creation status' do
+          expect(page).to have_content('Cluster is being created on Google Kubernetes Engine...')
+
+          Clusters::Cluster.last.provider.make_created!
+
+          expect(page).to have_content('Cluster was successfully created on Google Kubernetes Engine')
+        end
+
+        it 'user sees a error if something worng during creation' do
+          expect(page).to have_content('Cluster is being created on Google Kubernetes Engine...')
+
+          Clusters::Cluster.last.provider.make_errored!('Something wrong!')
+
+          expect(page).to have_content('Something wrong!')
+        end
+      end
+
+      context 'when user filled form with invalid parameters' do
+        before do
+          click_button 'Create cluster'
+        end
+
+        it 'user sees a validation error' do
+          expect(page).to have_css('#error_explanation')
+        end
+      end
+    end
+
+    context 'when user does have a cluster and visits cluster page' do
+      let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+
+      before do
+        visit project_cluster_path(project, cluster)
+      end
+
+      it 'user sees a cluster details page' do
+        expect(page).to have_button('Save')
+        expect(page.find(:css, '.cluster-name').value).to eq(cluster.name)
+      end
+
+      context 'when user disables the cluster' do
+        before do
+          page.find(:css, '.js-toggle-cluster').click
+          click_button 'Save'
+        end
+
+        it 'user sees the successful message' do
+          expect(page).to have_content('Cluster was successfully updated.')
+        end
+      end
+
+      context 'when user changes cluster parameters' do
+        before do
+          fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace'
+          click_button 'Save changes'
+        end
+
+        it 'user sees the successful message' do
+          expect(page).to have_content('Cluster was successfully updated.')
+          expect(cluster.reload.platform_kubernetes.namespace).to eq('my-namespace')
+        end
+      end
+
+      context 'when user destroy the cluster' do
+        before do
+          page.accept_confirm do
+            click_link 'Remove integration'
+          end
+        end
+
+        it 'user sees creation form with the successful message' do
+          expect(page).to have_content('Cluster integration was successfully removed.')
+          expect(page).to have_link('Add cluster')
+        end
+      end
+    end
+  end
+
+  context 'when user has not signed with Google' do
+    before do
+      visit project_clusters_path(project)
+
+      click_link 'Add cluster'
+      click_link 'Create on GKE'
+    end
+
+    it 'user sees a login page' do
+      expect(page).to have_css('.signin-with-google')
+    end
+  end
+end
diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb
new file mode 100644
index 00000000000..414f4acba86
--- /dev/null
+++ b/spec/features/projects/clusters/user_spec.rb
@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+feature 'User Cluster', :js do
+  include GoogleApi::CloudPlatformHelpers
+
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    gitlab_sign_in(user)
+    allow(Projects::ClustersController).to receive(:STATUS_POLLING_INTERVAL) { 100 }
+  end
+
+  context 'when user does not have a cluster and visits cluster index page' do
+    before do
+      visit project_clusters_path(project)
+
+      click_link 'Add cluster'
+      click_link 'Add an existing cluster'
+    end
+
+    context 'when user filled form with valid parameters' do
+      before do
+        fill_in 'cluster_name', with: 'dev-cluster'
+        fill_in 'cluster_platform_kubernetes_attributes_api_url', with: 'http://example.com'
+        fill_in 'cluster_platform_kubernetes_attributes_token', with: 'my-token'
+        click_button 'Add cluster'
+      end
+
+      it 'user sees a cluster details page' do
+        expect(page).to have_content('Enable cluster integration')
+        expect(page.find_field('cluster[name]').value).to eq('dev-cluster')
+        expect(page.find_field('cluster[platform_kubernetes_attributes][api_url]').value)
+          .to have_content('http://example.com')
+        expect(page.find_field('cluster[platform_kubernetes_attributes][token]').value)
+          .to have_content('my-token')
+      end
+    end
+
+    context 'when user filled form with invalid parameters' do
+      before do
+        click_button 'Add cluster'
+      end
+
+      it 'user sees a validation error' do
+        expect(page).to have_css('#error_explanation')
+      end
+    end
+  end
+
+  context 'when user does have a cluster and visits cluster page' do
+    let(:cluster) { create(:cluster, :provided_by_user, projects: [project]) }
+
+    before do
+      visit project_cluster_path(project, cluster)
+    end
+
+    it 'user sees a cluster details page' do
+      expect(page).to have_button('Save')
+    end
+
+    context 'when user disables the cluster' do
+      before do
+        page.find(:css, '.js-toggle-cluster').click
+        fill_in 'cluster_name', with: 'dev-cluster'
+        click_button 'Save'
+      end
+
+      it 'user sees the successful message' do
+        expect(page).to have_content('Cluster was successfully updated.')
+      end
+    end
+
+    context 'when user changes cluster parameters' do
+      before do
+        fill_in 'cluster_name', with: 'my-dev-cluster'
+        fill_in 'cluster_platform_kubernetes_attributes_namespace', with: 'my-namespace'
+        click_button 'Save changes'
+      end
+
+      it 'user sees the successful message' do
+        expect(page).to have_content('Cluster was successfully updated.')
+        expect(cluster.reload.name).to eq('my-dev-cluster')
+        expect(cluster.reload.platform_kubernetes.namespace).to eq('my-namespace')
+      end
+    end
+
+    context 'when user destroy the cluster' do
+      before do
+        page.accept_confirm do
+          click_link 'Remove integration'
+        end
+      end
+
+      it 'user sees creation form with the successful message' do
+        expect(page).to have_content('Cluster integration was successfully removed.')
+        expect(page).to have_link('Add cluster')
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb
index 018758d1bf1..dad943aac55 100644
--- a/spec/features/projects/clusters_spec.rb
+++ b/spec/features/projects/clusters_spec.rb
@@ -3,191 +3,77 @@ require 'spec_helper'
 feature 'Clusters', :js do
   include GoogleApi::CloudPlatformHelpers
 
-  let!(:project) { create(:project, :repository) }
-  let!(:user) { create(:user) }
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
 
   before do
     project.add_master(user)
     gitlab_sign_in(user)
   end
 
-  context 'when user has signed in Google' do
+  context 'when user does not have a cluster and visits cluster index page' do
     before do
-      allow_any_instance_of(Projects::ClustersController)
-        .to receive(:token_in_session).and_return('token')
-      allow_any_instance_of(Projects::ClustersController)
-        .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s)
+      visit project_clusters_path(project)
     end
 
-    context 'when user does not have a cluster and visits cluster index page' do
-      before do
-        visit project_clusters_path(project)
-
-        click_link 'Create on GKE'
-      end
-
-      it 'user sees a new page' do
-        expect(page).to have_button('Create cluster')
-      end
-
-      context 'when user filled form with valid parameters' do
-        before do
-          double.tap do |dbl|
-            allow(dbl).to receive(:status).and_return('RUNNING')
-            allow(dbl).to receive(:self_link)
-              .and_return('projects/gcp-project-12345/zones/us-central1-a/operations/ope-123')
-            allow_any_instance_of(GoogleApi::CloudPlatform::Client)
-              .to receive(:projects_zones_clusters_create).and_return(dbl)
-          end
-
-          allow(WaitForClusterCreationWorker).to receive(:perform_in).and_return(nil)
-
-          fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123'
-          fill_in 'cluster_name', with: 'dev-cluster'
-          click_button 'Create cluster'
-        end
-
-        it 'user sees a cluster details page and creation status' do
-          expect(page).to have_content('Cluster is being created on Google Container Engine...')
+    it 'sees empty state' do
+      expect(page).to have_link('Add cluster')
+      expect(page).to have_selector('.empty-state')
+    end
+  end
 
-          # Application Installation buttons
-          page.within('.js-cluster-application-row-helm') do
-            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button').text).to eq('Install')
-          end
+  context 'when user has a cluster and visits cluster index page' do
+    let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+    let(:project) { cluster.project }
 
-          Clusters::Cluster.last.provider.make_created!
+    before do
+      visit project_clusters_path(project)
+    end
 
-          expect(page).to have_content('Cluster was successfully created on Google Container Engine')
-        end
+    it 'user sees a table with one cluster' do
+      # One is the header row, the other the cluster row
+      expect(page).to have_selector('.gl-responsive-table-row', count: 2)
+    end
 
-        it 'user sees a error if something worng during creation' do
-          expect(page).to have_content('Cluster is being created on Google Container Engine...')
+    context 'inline update of cluster' do
+      it 'user can update cluster' do
+        expect(page).to have_selector('.js-toggle-cluster-list')
+      end
 
-          Clusters::Cluster.last.provider.make_errored!('Something wrong!')
+      context 'with sucessfull request' do
+        it 'user sees updated cluster' do
+          expect do
+            page.find('.js-toggle-cluster-list').click
+            wait_for_requests
+          end.to change { cluster.reload.enabled }
 
-          expect(page).to have_content('Something wrong!')
+          expect(page).not_to have_selector('.is-checked')
+          expect(cluster.reload).not_to be_enabled
         end
       end
 
-      context 'when user filled form with invalid parameters' do
-        before do
-          click_button 'Create cluster'
-        end
+      context 'with failed request' do
+        it 'user sees not update cluster and error message' do
+          expect_any_instance_of(Clusters::UpdateService).to receive(:execute).and_call_original
+          allow_any_instance_of(Clusters::Cluster).to receive(:valid?) { false }
 
-        it 'user sees a validation error' do
-          expect(page).to have_css('#error_explanation')
+          page.find('.js-toggle-cluster-list').click
+
+          expect(page).to have_content('Something went wrong on our end.')
+          expect(page).to have_selector('.is-checked')
+          expect(cluster.reload).to be_enabled
         end
       end
     end
 
-    context 'when user has a cluster and visits cluster index page' do
-      let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
-      let(:project) { cluster.project }
-
+    context 'when user clicks on a cluster' do
       before do
-        visit project_clusters_path(project)
+        click_link cluster.name
       end
 
-      it 'user sees an cluster details page' do
+      it 'user sees a cluster details page' do
         expect(page).to have_button('Save')
         expect(page.find(:css, '.cluster-name').value).to eq(cluster.name)
-
-        # Application Installation buttons
-        page.within('.js-cluster-application-row-helm') do
-          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to be_nil
-          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
-        end
-      end
-
-      context 'when user installs application: Helm Tiller' do
-        before do
-          allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
-
-          page.within('.js-cluster-application-row-helm') do
-            page.find(:css, '.js-cluster-application-install-button').click
-          end
-        end
-
-        it 'user sees status transition' do
-          page.within('.js-cluster-application-row-helm') do
-            # FE sends request and gets the response, then the buttons is "Install"
-            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
-
-            Clusters::Cluster.last.application_helm.make_installing!
-
-            # FE starts polling and update the buttons to "Installing"
-            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
-
-            Clusters::Cluster.last.application_helm.make_installed!
-
-            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
-          end
-
-          expect(page).to have_content('Helm Tiller was successfully installed on your cluster')
-        end
-      end
-
-      context 'when user installs application: Ingress' do
-        before do
-          allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
-          # Helm Tiller needs to be installed before you can install Ingress
-          create(:cluster_applications_helm, :installed, cluster: cluster)
-
-          visit project_clusters_path(project)
-
-          page.within('.js-cluster-application-row-ingress') do
-            page.find(:css, '.js-cluster-application-install-button').click
-          end
-        end
-
-        it 'user sees status transition' do
-          page.within('.js-cluster-application-row-ingress') do
-            # FE sends request and gets the response, then the buttons is "Install"
-            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
-
-            Clusters::Cluster.last.application_ingress.make_installing!
-
-            # FE starts polling and update the buttons to "Installing"
-            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
-
-            Clusters::Cluster.last.application_ingress.make_installed!
-
-            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
-          end
-
-          expect(page).to have_content('Ingress was successfully installed on your cluster')
-        end
-      end
-
-      context 'when user disables the cluster' do
-        before do
-          page.find(:css, '.js-toggle-cluster').click
-          click_button 'Save'
-        end
-
-        it 'user sees the succeccful message' do
-          expect(page).to have_content('Cluster was successfully updated.')
-        end
-      end
-
-      context 'when user destory the cluster' do
-        before do
-          page.accept_confirm do
-            click_link 'Remove integration'
-          end
-        end
-
-        it 'user sees creation form with the succeccful message' do
-          expect(page).to have_content('Cluster integration was successfully removed.')
-          expect(page).to have_link('Create on GKE')
-        end
       end
     end
   end
diff --git a/spec/features/projects/features_visibility_spec.rb b/spec/features/projects/features_visibility_spec.rb
index 951456763dc..033c45a60bf 100644
--- a/spec/features/projects/features_visibility_spec.rb
+++ b/spec/features/projects/features_visibility_spec.rb
@@ -177,7 +177,7 @@ describe 'Edit Project Settings' do
         click_button "Save changes"
       end
 
-      expect(find(".sharing-permissions")).to have_selector(".project-feature-toggle.disabled", count: 2)
+      expect(find(".sharing-permissions")).to have_selector(".project-feature-toggle.is-disabled", count: 2)
     end
 
     it "shows empty features project homepage" do
@@ -272,10 +272,10 @@ describe 'Edit Project Settings' do
   end
 
   def toggle_feature_off(feature_name)
-    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle.checked").click
+    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle.is-checked").click
   end
 
   def toggle_feature_on(feature_name)
-    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle:not(.checked)").click
+    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle:not(.is-checked)").click
   end
 end
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index a012db8fd27..0257cd157c9 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -32,7 +32,7 @@ feature 'issuable templates', :js do
         message: 'added issue template',
         branch_name: 'master')
       visit project_issue_path project, issue
-      page.within('.content .issuable-actions') do
+      page.within('.js-issuable-actions') do
         click_on 'Edit'
       end
       fill_in :'issuable-title', with: 'test issue title'
@@ -77,7 +77,7 @@ feature 'issuable templates', :js do
         message: 'added issue template',
         branch_name: 'master')
       visit project_issue_path project, issue
-      page.within('.content .issuable-actions') do
+      page.within('.js-issuable-actions') do
         click_on 'Edit'
       end
       fill_in :'issuable-title', with: 'test issue title'
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index c2a0d2395a9..0b0d5a2dce8 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -187,7 +187,7 @@ feature 'Jobs' do
 
     context "Download artifacts" do
       before do
-        job.update_attributes(artifacts_file: artifacts_file)
+        job.update_attributes(legacy_artifacts_file: artifacts_file)
         visit project_job_path(project, job)
       end
 
@@ -198,7 +198,7 @@ feature 'Jobs' do
 
     context 'Artifacts expire date' do
       before do
-        job.update_attributes(artifacts_file: artifacts_file,
+        job.update_attributes(legacy_artifacts_file: artifacts_file,
                               artifacts_expire_at: expire_at)
 
         visit project_job_path(project, job)
@@ -422,14 +422,14 @@ feature 'Jobs' do
 
   describe "GET /:project/jobs/:id/download" do
     before do
-      job.update_attributes(artifacts_file: artifacts_file)
+      job.update_attributes(legacy_artifacts_file: artifacts_file)
       visit project_job_path(project, job)
       click_link 'Download'
     end
 
     context "Build from other project" do
       before do
-        job2.update_attributes(artifacts_file: artifacts_file)
+        job2.update_attributes(legacy_artifacts_file: artifacts_file)
         visit download_project_job_artifacts_path(project, job2)
       end
 
diff --git a/spec/features/projects/labels/user_sees_links_to_issuables.rb b/spec/features/projects/labels/user_sees_links_to_issuables.rb
new file mode 100644
index 00000000000..aa56fd7f74e
--- /dev/null
+++ b/spec/features/projects/labels/user_sees_links_to_issuables.rb
@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+feature 'Projects > Labels > User sees links to issuables' do
+  set(:user) { create(:user) }
+
+  before do
+    label # creates the label
+    project.add_developer(user)
+    sign_in user
+    visit project_labels_path(project)
+  end
+
+  context 'with a project label' do
+    let(:label) { create(:label, project: project, title: 'bug') }
+
+    context 'when merge requests and issues are enabled for the project' do
+      let(:project) { create(:project, :public) }
+
+      scenario 'shows links to MRs and issues' do
+        expect(page).to have_link('view merge requests')
+        expect(page).to have_link('view open issues')
+      end
+    end
+
+    context 'when issues are disabled for the project' do
+      let(:project) { create(:project, :public, issues_access_level: ProjectFeature::DISABLED) }
+
+      scenario 'shows links to MRs but not to issues' do
+        expect(page).to have_link('view merge requests')
+        expect(page).not_to have_link('view open issues')
+      end
+    end
+
+    context 'when merge requests are disabled for the project' do
+      let(:project) { create(:project, :public, merge_requests_access_level: ProjectFeature::DISABLED) }
+
+      scenario 'shows links to issues but not to MRs' do
+        expect(page).not_to have_link('view merge requests')
+        expect(page).to have_link('view open issues')
+      end
+    end
+  end
+
+  context 'with a group label' do
+    set(:group) { create(:group) }
+    let(:label) { create(:group_label, group: group, title: 'bug') }
+
+    context 'when merge requests and issues are enabled for the project' do
+      let(:project) { create(:project, :public, namespace: group) }
+
+      scenario 'shows links to MRs and issues' do
+        expect(page).to have_link('view merge requests')
+        expect(page).to have_link('view open issues')
+      end
+    end
+
+    context 'when issues are disabled for the project' do
+      let(:project) { create(:project, :public, namespace: group, issues_access_level: ProjectFeature::DISABLED) }
+
+      scenario 'shows links to MRs and issues' do
+        expect(page).to have_link('view merge requests')
+        expect(page).to have_link('view open issues')
+      end
+    end
+
+    context 'when merge requests are disabled for the project' do
+      let(:project) { create(:project, :public, namespace: group, merge_requests_access_level: ProjectFeature::DISABLED) }
+
+      scenario 'shows links to MRs and issues' do
+        expect(page).to have_link('view merge requests')
+        expect(page).to have_link('view open issues')
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index b8fa1a54c24..888e290292b 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -185,6 +185,36 @@ describe 'Pipeline', :js do
     end
   end
 
+  context 'when user does not have access to read jobs' do
+    before do
+      project.update(public_builds: false)
+    end
+
+    describe 'GET /:project/pipelines/:id' do
+      include_context 'pipeline builds'
+
+      let(:project) { create(:project, :repository) }
+      let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id, user: user) }
+
+      before do
+        visit project_pipeline_path(project, pipeline)
+      end
+
+      it 'shows the pipeline graph' do
+        expect(page).to have_selector('.pipeline-visualization')
+        expect(page).to have_content('Build')
+        expect(page).to have_content('Test')
+        expect(page).to have_content('Deploy')
+        expect(page).to have_content('Retry')
+        expect(page).to have_content('Cancel running')
+      end
+
+      it 'should not link to job' do
+        expect(page).not_to have_selector('.js-pipeline-graph-job-link')
+      end
+    end
+  end
+
   describe 'GET /:project/pipelines/:id/builds' do
     include_context 'pipeline builds'
 
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index a1b1d94ae06..b87b47d0e1a 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -304,7 +304,7 @@ describe 'Pipelines', :js do
 
         context 'with artifacts expired' do
           let!(:with_artifacts_expired) do
-            create(:ci_build, :artifacts_expired, :success,
+            create(:ci_build, :expired, :success,
               pipeline: pipeline,
               name: 'rspec',
               stage: 'test')
diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb
index eb8e7265dd3..561f08cba00 100644
--- a/spec/features/projects/settings/pipelines_settings_spec.rb
+++ b/spec/features/projects/settings/pipelines_settings_spec.rb
@@ -59,107 +59,6 @@ feature "Pipelines settings" do
         expect(project.auto_devops).to be_present
         expect(project.auto_devops).not_to be_enabled
       end
-
-      describe 'Immediately run pipeline checkbox option', :js do
-        context 'when auto devops is set to instance default (enabled)' do
-          before do
-            stub_application_setting(auto_devops_enabled: true)
-            project.create_auto_devops!(enabled: nil)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not show checkboxes on page-load' do
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-
-          it 'selecting explicit disabled hides all checkboxes' do
-            page.choose('project_auto_devops_attributes_enabled_false')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-
-          it 'selecting explicit enabled hides all checkboxes because we are already enabled' do
-            page.choose('project_auto_devops_attributes_enabled_true')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-        end
-
-        context 'when auto devops is set to instance default (disabled)' do
-          before do
-            stub_application_setting(auto_devops_enabled: false)
-            project.create_auto_devops!(enabled: nil)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not show checkboxes on page-load' do
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-
-          it 'selecting explicit disabled hides all checkboxes' do
-            page.choose('project_auto_devops_attributes_enabled_false')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 1, visible: false)
-          end
-
-          it 'selecting explicit enabled shows a checkbox' do
-            page.choose('project_auto_devops_attributes_enabled_true')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper:not(.hide)', count: 1)
-          end
-        end
-
-        context 'when auto devops is set to explicit disabled' do
-          before do
-            stub_application_setting(auto_devops_enabled: true)
-            project.create_auto_devops!(enabled: false)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not show checkboxes on page-load' do
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper.hide', count: 2, visible: false)
-          end
-
-          it 'selecting explicit enabled shows a checkbox' do
-            page.choose('project_auto_devops_attributes_enabled_true')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper:not(.hide)', count: 1)
-          end
-
-          it 'selecting instance default (enabled) shows a checkbox' do
-            page.choose('project_auto_devops_attributes_enabled_')
-
-            expect(page).to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper:not(.hide)', count: 1)
-          end
-        end
-
-        context 'when auto devops is set to explicit enabled' do
-          before do
-            stub_application_setting(auto_devops_enabled: false)
-            project.create_auto_devops!(enabled: true)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not have any checkboxes' do
-            expect(page).not_to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper', visible: false)
-          end
-        end
-
-        context 'when master contains a .gitlab-ci.yml file' do
-          let(:project) { create(:project, :repository) }
-
-          before do
-            project.repository.create_file(user, '.gitlab-ci.yml', "script: ['test']", message: 'test', branch_name: project.default_branch)
-            stub_application_setting(auto_devops_enabled: true)
-            project.create_auto_devops!(enabled: false)
-            visit project_settings_ci_cd_path(project)
-          end
-
-          it 'does not have any checkboxes' do
-            expect(page).not_to have_selector('.js-run-auto-devops-pipeline-checkbox-wrapper', visible: false)
-          end
-        end
-      end
     end
   end
 end
diff --git a/spec/features/projects/snippets_spec.rb b/spec/features/projects/snippets_spec.rb
index 1cfbbb4cb62..0fa7ca9afd4 100644
--- a/spec/features/projects/snippets_spec.rb
+++ b/spec/features/projects/snippets_spec.rb
@@ -39,6 +39,11 @@ describe 'Project snippets', :js do
 
         expect(page).to have_selector('.atwho-view')
       end
+
+      it 'should have zen mode' do
+        find('.js-zen-enter').click()
+        expect(page).to have_selector('.fullscreen')
+      end
     end
   end
 end