fix merge conflict with issue_show haml

87 files changed, 112 insertions, 182 deletions

diff --git a/spec/features/admin/admin_labels_spec.rb b/spec/features/admin/admin_labels_spec.rb
index 6d6c9165c83..fa3d9ee25c0 100644
--- a/spec/features/admin/admin_labels_spec.rb
+++ b/spec/features/admin/admin_labels_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 RSpec.describe 'admin issues labels' do
-  include WaitForAjax
-
   let!(:bug_label) { Label.create(title: 'bug', template: true) }
   let!(:feature_label) { Label.create(title: 'feature', template: true) }
 
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index f6c3bc6a58d..c5b1ef1295c 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe "Admin::Users", feature: true do
-  include WaitForAjax
-
   let!(:user) do
     create(:omniauth_user, provider: 'twitter', extern_uid: '123456')
   end
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index 6f36c74c911..67b0f006854 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe 'Auto deploy' do
-  include WaitForAjax
-
   let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
 
   before do
     project.create_kubernetes_service(
diff --git a/spec/features/boards/add_issues_modal_spec.rb b/spec/features/boards/add_issues_modal_spec.rb
index 248c31115ad..505e0b5c355 100644
--- a/spec/features/boards/add_issues_modal_spec.rb
+++ b/spec/features/boards/add_issues_modal_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe 'Issue Boards add issue modal', :feature, :js do
-  include WaitForAjax
   include WaitForVueResource
 
   let(:project) { create(:empty_project, :public) }
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 30ad169e30e..a172ce1e8c0 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe 'Issue Boards', feature: true, js: true do
-  include WaitForAjax
   include WaitForVueResource
   include DragTo
 
diff --git a/spec/features/boards/new_issue_spec.rb b/spec/features/boards/new_issue_spec.rb
index e6d7cf106d4..f04a1a89e96 100644
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe 'Issue Boards new issue', feature: true, js: true do
-  include WaitForAjax
   include WaitForVueResource
 
   let(:project) { create(:empty_project, :public) }
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index 3332e07ec31..bafa4f05937 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe 'Issue Boards', feature: true, js: true do
-  include WaitForAjax
   include WaitForVueResource
 
   let(:user)         { create(:user) }
diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index 35d090c4b7f..496faf87a16 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 feature 'Contributions Calendar', :feature, :js do
-  include WaitForAjax
-
   let(:user) { create(:user) }
-  let(:contributed_project) { create(:project, :public) }
+  let(:contributed_project) { create(:empty_project, :public) }
   let(:issue_note) { create(:note, project: contributed_project) }
 
   # Ex/ Sunday Jan 1, 2016
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 881f1fca4d1..e6c4ab24de5 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Commits' do
   include CiStatusHelper
 
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
 
   describe 'CI' do
     before do
diff --git a/spec/features/copy_as_gfm_spec.rb b/spec/features/copy_as_gfm_spec.rb
index 55df7e45f79..64a6c70061b 100644
--- a/spec/features/copy_as_gfm_spec.rb
+++ b/spec/features/copy_as_gfm_spec.rb
@@ -433,7 +433,7 @@ describe 'Copy as GFM', feature: true, js: true do
   end
 
   describe 'Copying code' do
-    let(:project) { create(:project) }
+    let(:project) { create(:project, :repository) }
 
     context 'from a diff' do
       before do
diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb
index 0648c89a5c7..b93275c330b 100644
--- a/spec/features/cycle_analytics_spec.rb
+++ b/spec/features/cycle_analytics_spec.rb
@@ -1,11 +1,9 @@
 require 'spec_helper'
 
 feature 'Cycle Analytics', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:guest) { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
   let(:issue) { create(:issue, project: project, created_at: 2.days.ago) }
   let(:milestone) { create(:milestone, project: project) }
   let(:mr) { create_merge_request_closing_issue(issue) }
diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb
index dc9d09fa396..0e9e3f78be2 100644
--- a/spec/features/dashboard/datetime_on_tooltips_spec.rb
+++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Tooltips on .timeago dates', feature: true, js: true do
-  include WaitForAjax
-
   let(:user)            { create(:user) }
   let(:project)         { create(:project, name: 'test', namespace: user.namespace) }
   let(:created_date)    { Date.yesterday.to_time }
diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb
index ca04107d33a..52b4d82e856 100644
--- a/spec/features/dashboard/groups_list_spec.rb
+++ b/spec/features/dashboard/groups_list_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Dashboard Groups page', js: true, feature: true do
-  include WaitForAjax
-
   let!(:user) { create :user }
   let!(:group) { create(:group) }
   let!(:nested_group) { create(:group, :nested) }
diff --git a/spec/features/dashboard/project_member_activity_index_spec.rb b/spec/features/dashboard/project_member_activity_index_spec.rb
index 49d93db58a9..16c214ae060 100644
--- a/spec/features/dashboard/project_member_activity_index_spec.rb
+++ b/spec/features/dashboard/project_member_activity_index_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Project member activity', feature: true, js: true do
-  include WaitForAjax
-
   let(:user)            { create(:user) }
   let(:project)         { create(:empty_project, :public, name: 'x', namespace: user.namespace) }
 
diff --git a/spec/features/dashboard_issues_spec.rb b/spec/features/dashboard_issues_spec.rb
index 8c61cdebc4b..b6b87905231 100644
--- a/spec/features/dashboard_issues_spec.rb
+++ b/spec/features/dashboard_issues_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Dashboard Issues filtering", feature: true, js: true do
   let(:user)      { create(:user) }
-  let(:project)   { create(:project) }
+  let(:project)   { create(:empty_project) }
   let(:milestone) { create(:milestone, project: project) }
 
   context 'filtering by milestone' do
diff --git a/spec/features/expand_collapse_diffs_spec.rb b/spec/features/expand_collapse_diffs_spec.rb
index 8c64b050e19..76c77e0bc5f 100644
--- a/spec/features/expand_collapse_diffs_spec.rb
+++ b/spec/features/expand_collapse_diffs_spec.rb
@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 feature 'Expand and collapse diffs', js: true, feature: true do
-  include WaitForAjax
-
   let(:branch) { 'expand-collapse-diffs' }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
 
   before do
     login_as :admin
diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb
index 9daaaa8e555..8e5421a984b 100644
--- a/spec/features/explore/groups_list_spec.rb
+++ b/spec/features/explore/groups_list_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Explore Groups page', js: true, feature: true do
-  include WaitForAjax
-
   let!(:user) { create :user }
   let!(:group) { create(:group) }
   let!(:public_group) { create(:group, :public) }
diff --git a/spec/features/gitlab_flavored_markdown_spec.rb b/spec/features/gitlab_flavored_markdown_spec.rb
index 876f33dd03e..01b1aee4fd3 100644
--- a/spec/features/gitlab_flavored_markdown_spec.rb
+++ b/spec/features/gitlab_flavored_markdown_spec.rb
@@ -1,28 +1,28 @@
 require 'spec_helper'
 
 describe "GitLab Flavored Markdown", feature: true do
-  let(:project) { create(:project) }
+  let(:project) { create(:empty_project) }
   let(:issue) { create(:issue, project: project) }
-  let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
   let(:fred) do
-    u = create(:user, name: "fred")
-    project.team << [u, :master]
-    u
+    create(:user, name: 'fred') do |user|
+      project.add_master(user)
+    end
   end
 
   before do
-    allow_any_instance_of(Commit).to receive(:title).
-      and_return("fix #{issue.to_reference}\n\nask #{fred.to_reference} for details")
+    login_as(:user)
+    project.add_developer(@user)
   end
 
-  let(:commit) { project.commit }
+  describe "for commits" do
+    let(:project) { create(:project, :repository) }
+    let(:commit) { project.commit }
 
-  before do
-    login_as :user
-    project.team << [@user, :developer]
-  end
+    before do
+      allow_any_instance_of(Commit).to receive(:title).
+        and_return("fix #{issue.to_reference}\n\nask #{fred.to_reference} for details")
+    end
 
-  describe "for commits" do
     it "renders title in commits#index" do
       visit namespace_project_commits_path(project.namespace, project, 'master', limit: 1)
 
@@ -92,6 +92,8 @@ describe "GitLab Flavored Markdown", feature: true do
   end
 
   describe "for merge requests" do
+    let(:project) { create(:project, :repository) }
+
     before do
       @merge_request = create(:merge_request, source_project: project, target_project: project, title: "fix #{issue.to_reference}")
     end
diff --git a/spec/features/global_search_spec.rb b/spec/features/global_search_spec.rb
index f6409e00f22..4b22b07494d 100644
--- a/spec/features/global_search_spec.rb
+++ b/spec/features/global_search_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Global search', feature: true do
   let(:user) { create(:user) }
-  let(:project) { create(:project, namespace: user.namespace) }
+  let(:project) { create(:empty_project, namespace: user.namespace) }
 
   before do
     project.team << [user, :master]
diff --git a/spec/features/issues/award_emoji_spec.rb b/spec/features/issues/award_emoji_spec.rb
index 8e67ab028d7..71df3c949db 100644
--- a/spec/features/issues/award_emoji_spec.rb
+++ b/spec/features/issues/award_emoji_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe 'Awards Emoji', feature: true do
-  include WaitForAjax
   include WaitForVueResource
 
   let!(:project)   { create(:project, :public) }
diff --git a/spec/features/issues/bulk_assignment_labels_spec.rb b/spec/features/issues/bulk_assignment_labels_spec.rb
index 2f59630b4fb..1de50d6d77e 100644
--- a/spec/features/issues/bulk_assignment_labels_spec.rb
+++ b/spec/features/issues/bulk_assignment_labels_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 feature 'Issues > Labels bulk assignment', feature: true do
-  include WaitForAjax
-
   let(:user)      { create(:user) }
   let!(:project)  { create(:project) }
   let!(:issue1)   { create(:issue, project: project, title: "Issue 1") }
diff --git a/spec/features/issues/create_issue_for_single_discussion_in_merge_request.rb b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
index 88e2cc60d79..3a5a79e03f4 100644
--- a/spec/features/issues/create_issue_for_single_discussion_in_merge_request.rb
+++ b/spec/features/issues/create_issue_for_single_discussion_in_merge_request_spec.rb
@@ -4,7 +4,7 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
   let(:user) { create(:user) }
   let(:project) { create(:project, only_allow_merge_if_all_discussions_are_resolved: true) }
   let(:merge_request) { create(:merge_request, source_project: project) }
-  let!(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request, noteable: merge_request, project: project)]).first }
+  let!(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
 
   describe 'As a user with access to the project' do
     before do
@@ -74,8 +74,8 @@ feature 'Resolve an open discussion in a merge request by creating an issue', fe
 
     it 'Shows a notice to ask someone else to resolve the discussions' do
       expect(page).to have_content("The discussion at #{merge_request.to_reference}"\
-                                   "(discussion #{discussion.first_note.id}) will stay unresolved."\
-                                   "Ask someone with permission to resolve it.")
+                                   " (discussion #{discussion.first_note.id}) will stay unresolved."\
+                                   " Ask someone with permission to resolve it.")
     end
   end
 end
diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
index 3d1a9ed1722..0b573d7cef4 100644
--- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
 
 describe 'Dropdown assignee', :feature, :js do
   include FilteredSearchHelpers
-  include WaitForAjax
 
   let!(:project) { create(:empty_project) }
   let!(:user) { create(:user, name: 'administrator', username: 'root') }
diff --git a/spec/features/issues/filtered_search/dropdown_author_spec.rb b/spec/features/issues/filtered_search/dropdown_author_spec.rb
index 990e3b3e60c..0579d6c80ab 100644
--- a/spec/features/issues/filtered_search/dropdown_author_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_author_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
 
 describe 'Dropdown author', js: true, feature: true do
   include FilteredSearchHelpers
-  include WaitForAjax
 
   let!(:project) { create(:empty_project) }
   let!(:user) { create(:user, name: 'administrator', username: 'root') }
diff --git a/spec/features/issues/filtered_search/dropdown_hint_spec.rb b/spec/features/issues/filtered_search/dropdown_hint_spec.rb
index cae01f37b6b..b9a37cfcc22 100644
--- a/spec/features/issues/filtered_search/dropdown_hint_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_hint_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
 
 describe 'Dropdown hint', :js, :feature do
   include FilteredSearchHelpers
-  include WaitForAjax
 
   let!(:project) { create(:empty_project) }
   let!(:user) { create(:user) }
diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb
index 6f00066de4d..81ee0e2e4f6 100644
--- a/spec/features/issues/filtered_search/filter_issues_spec.rb
+++ b/spec/features/issues/filtered_search/filter_issues_spec.rb
@@ -3,7 +3,6 @@ require 'spec_helper'
 describe 'Filter issues', js: true, feature: true do
   include Devise::Test::IntegrationHelpers
   include FilteredSearchHelpers
-  include WaitForAjax
 
   let!(:group) { create(:group) }
   let!(:project) { create(:project, group: group) }
diff --git a/spec/features/issues/filtered_search/recent_searches_spec.rb b/spec/features/issues/filtered_search/recent_searches_spec.rb
index f506065a242..08fe3b4553b 100644
--- a/spec/features/issues/filtered_search/recent_searches_spec.rb
+++ b/spec/features/issues/filtered_search/recent_searches_spec.rb
@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'Recent searches', js: true, feature: true do
   include FilteredSearchHelpers
-  include WaitForAjax
 
   let!(:group) { create(:group) }
   let!(:project) { create(:project, group: group) }
diff --git a/spec/features/issues/filtered_search/search_bar_spec.rb b/spec/features/issues/filtered_search/search_bar_spec.rb
index 28137f11b92..3ea95aed0a6 100644
--- a/spec/features/issues/filtered_search/search_bar_spec.rb
+++ b/spec/features/issues/filtered_search/search_bar_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
 
 describe 'Search bar', js: true, feature: true do
   include FilteredSearchHelpers
-  include WaitForAjax
 
   let!(:project) { create(:empty_project) }
   let!(:user) { create(:user) }
diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index 7135565294b..b571f6bd861 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 feature 'GFM autocomplete', feature: true, js: true do
-  include WaitForAjax
   let(:user)    { create(:user, name: '💃speciąl someone💃', username: 'someone.special') }
   let(:project) { create(:project) }
   let(:label) { create(:label, project: project, title: 'special+') }
diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index 85585587fb1..baacd7edb86 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 feature 'Issue Sidebar', feature: true do
-  include WaitForAjax
   include MobileHelpers
 
   let(:project) { create(:project, :public) }
diff --git a/spec/features/issues/update_issues_spec.rb b/spec/features/issues/update_issues_spec.rb
index ae5da3877a8..7fa83c1fcf7 100644
--- a/spec/features/issues/update_issues_spec.rb
+++ b/spec/features/issues/update_issues_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 feature 'Multiple issue updating from issues#index', feature: true do
-  include WaitForAjax
-
   let!(:project)   { create(:project) }
   let!(:issue)     { create(:issue, project: project) }
   let!(:user)      { create(:user)}
diff --git a/spec/features/issues/user_uses_slash_commands_spec.rb b/spec/features/issues/user_uses_slash_commands_spec.rb
index 0a9cd11ad6e..4cd6c1171ac 100644
--- a/spec/features/issues/user_uses_slash_commands_spec.rb
+++ b/spec/features/issues/user_uses_slash_commands_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
 
 feature 'Issues > User uses slash commands', feature: true, js: true do
   include SlashCommandsHelpers
-  include WaitForAjax
 
   it_behaves_like 'issuable record that supports slash commands in its description and notes', :issue do
     let(:issuable) { create(:issue, project: project) }
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 55eca187f6c..81cc8513454 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -4,22 +4,14 @@ describe 'Issues', feature: true do
   include DropzoneHelper
   include IssueHelpers
   include SortingHelper
-  include WaitForAjax
 
-  let(:project) { create(:project, :public) }
+  let(:project) { create(:empty_project, :public) }
 
   before do
     login_as :user
     user2 = create(:user)
 
     project.team << [[@user, user2], :developer]
-
-    project.repository.create_file(
-      @user,
-      '.gitlab/issue_templates/bug.md',
-      'this is a test "bug" template',
-      message: 'added issue template',
-      branch_name: 'master')
   end
 
   describe 'Edit issue' do
@@ -378,7 +370,7 @@ describe 'Issues', feature: true do
   end
 
   describe 'when I want to reset my incoming email token' do
-    let(:project1) { create(:project, namespace: @user.namespace) }
+    let(:project1) { create(:empty_project, namespace: @user.namespace) }
     let!(:issue) { create(:issue, project: project1) }
 
     before do
@@ -610,7 +602,16 @@ describe 'Issues', feature: true do
     end
 
     context 'form filled by URL parameters' do
+      let(:project) { create(:project, :public, :repository) }
+
       before do
+        project.repository.create_file(
+          @user,
+          '.gitlab/issue_templates/bug.md',
+          'this is a test "bug" template',
+          message: 'added issue template',
+          branch_name: 'master')
+
         visit new_namespace_project_issue_path(project.namespace, project, issuable_template: 'bug')
       end
 
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb
index 18508a44184..43977ad2fc5 100644
--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Merge request conflict resolution', js: true, feature: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:project) { create(:project) }
 
diff --git a/spec/features/merge_requests/deleted_source_branch_spec.rb b/spec/features/merge_requests/deleted_source_branch_spec.rb
index 0952b17b63e..648678e2b1a 100644
--- a/spec/features/merge_requests/deleted_source_branch_spec.rb
+++ b/spec/features/merge_requests/deleted_source_branch_spec.rb
@@ -4,8 +4,6 @@ require 'spec_helper'
 # message to be shown by JavaScript when the source branch was deleted.
 # Please do not remove "js: true".
 describe 'Deleted source branch', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:merge_request) { create(:merge_request) }
 
diff --git a/spec/features/merge_requests/diff_notes_avatars_spec.rb b/spec/features/merge_requests/diff_notes_avatars_spec.rb
index 218d95a88b8..b2e170513c4 100644
--- a/spec/features/merge_requests/diff_notes_avatars_spec.rb
+++ b/spec/features/merge_requests/diff_notes_avatars_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Diff note avatars', feature: true, js: true do
-  include WaitForAjax
-
   let(:user)          { create(:user) }
   let(:project)       { create(:project, :public) }
   let(:merge_request) { create(:merge_request_with_diffs, source_project: project, author: user, title: "Bug NS-04") }
diff --git a/spec/features/merge_requests/diffs_spec.rb b/spec/features/merge_requests/diffs_spec.rb
index 4a6c76a5caf..7dee3b852ca 100644
--- a/spec/features/merge_requests/diffs_spec.rb
+++ b/spec/features/merge_requests/diffs_spec.rb
@@ -1,11 +1,8 @@
 require 'spec_helper'
 
 feature 'Diffs URL', js: true, feature: true do
-  before do
-    login_as :admin
-    @merge_request = create(:merge_request)
-    @project = @merge_request.source_project
-  end
+  let(:project) { create(:project, :public) }
+  let(:merge_request) { create(:merge_request, source_project: project) }
 
   context 'when visit with */* as accept header' do
     before(:each) do
@@ -13,9 +10,9 @@ feature 'Diffs URL', js: true, feature: true do
     end
 
     it 'renders the notes' do
-      create :note_on_merge_request, project: @project, noteable: @merge_request, note: 'Rebasing with master'
+      create :note_on_merge_request, project: project, noteable: merge_request, note: 'Rebasing with master'
 
-      visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
+      visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
 
       # Load notes and diff through AJAX
       expect(page).to have_css('.note-text', visible: false, text: 'Rebasing with master')
@@ -25,10 +22,9 @@ feature 'Diffs URL', js: true, feature: true do
 
   context 'when merge request has overflow' do
     it 'displays warning' do
-      allow_any_instance_of(MergeRequestDiff).to receive(:overflow?).and_return(true)
-      allow(Commit).to receive(:max_diff_options).and_return(max_files: 20, max_lines: 20)
+      allow(Commit).to receive(:max_diff_options).and_return(max_files: 3)
 
-      visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
+      visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
 
       page.within('.alert') do
         expect(page).to have_text("Too many changes to show. Plain diff Email patch To preserve
@@ -36,4 +32,35 @@ feature 'Diffs URL', js: true, feature: true do
       end
     end
   end
+
+  context 'when editing file' do
+    let(:author_user) { create(:user) }
+    let(:user) { create(:user) }
+    let(:forked_project) { Projects::ForkService.new(project, author_user).execute }
+    let(:merge_request) { create(:merge_request_with_diffs, source_project: forked_project, target_project: project, author: author_user) }
+    let(:changelog_id) { Digest::SHA1.hexdigest("CHANGELOG") }
+
+    context 'as author' do
+      it 'shows direct edit link' do
+        login_as(author_user)
+        visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
+
+        # Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax
+        expect(page).to have_selector("[id=\"#{changelog_id}\"] a.js-edit-blob")
+      end
+    end
+
+    context 'as user who needs to fork' do
+      it 'shows fork/cancel confirmation' do
+        login_as(user)
+        visit diffs_namespace_project_merge_request_path(project.namespace, project, merge_request)
+
+        # Throws `Capybara::Poltergeist::InvalidSelector` if we try to use `#hash` syntax
+        find("[id=\"#{changelog_id}\"] .js-edit-blob").click
+
+        expect(page).to have_selector('.js-fork-suggestion-button', count: 1)
+        expect(page).to have_selector('.js-cancel-fork-suggestion-button', count: 1)
+      end
+    end
+  end
 end
diff --git a/spec/features/merge_requests/filter_by_labels_spec.rb b/spec/features/merge_requests/filter_by_labels_spec.rb
index 55f3c1863ff..32a9082b9b9 100644
--- a/spec/features/merge_requests/filter_by_labels_spec.rb
+++ b/spec/features/merge_requests/filter_by_labels_spec.rb
@@ -3,7 +3,6 @@ require 'rails_helper'
 feature 'Issue filtering by Labels', feature: true, js: true do
   include FilteredSearchHelpers
   include MergeRequestHelpers
-  include WaitForAjax
 
   let(:project) { create(:project, :public) }
   let!(:user)   { create(:user) }
diff --git a/spec/features/merge_requests/filter_merge_requests_spec.rb b/spec/features/merge_requests/filter_merge_requests_spec.rb
index 70e3997e716..2da60e9f4ad 100644
--- a/spec/features/merge_requests/filter_merge_requests_spec.rb
+++ b/spec/features/merge_requests/filter_merge_requests_spec.rb
@@ -3,7 +3,6 @@ require 'rails_helper'
 describe 'Filter merge requests', feature: true do
   include FilteredSearchHelpers
   include MergeRequestHelpers
-  include WaitForAjax
 
   let!(:project)   { create(:project) }
   let!(:group)     { create(:group) }
diff --git a/spec/features/merge_requests/mini_pipeline_graph_spec.rb b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
index 84ad8765d8f..449a60c1d05 100644
--- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb
+++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 feature 'Mini Pipeline Graph', :js, :feature do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/merge_requests/pipelines_spec.rb b/spec/features/merge_requests/pipelines_spec.rb
index 9c4c0525267..99e283ac181 100644
--- a/spec/features/merge_requests/pipelines_spec.rb
+++ b/spec/features/merge_requests/pipelines_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Pipelines for Merge Requests', feature: true, js: true do
-  include WaitForAjax
-
   given(:user) { create(:user) }
   given(:merge_request) { create(:merge_request) }
   given(:project) { merge_request.target_project }
diff --git a/spec/features/merge_requests/reset_filters_spec.rb b/spec/features/merge_requests/reset_filters_spec.rb
index df5943f9136..275f81f50dc 100644
--- a/spec/features/merge_requests/reset_filters_spec.rb
+++ b/spec/features/merge_requests/reset_filters_spec.rb
@@ -3,7 +3,6 @@ require 'rails_helper'
 feature 'Merge requests filter clear button', feature: true, js: true do
   include FilteredSearchHelpers
   include MergeRequestHelpers
-  include WaitForAjax
   include IssueHelpers
 
   let!(:project) { create(:project, :public) }
diff --git a/spec/features/merge_requests/update_merge_requests_spec.rb b/spec/features/merge_requests/update_merge_requests_spec.rb
index b56fdfe5611..9ecc998785b 100644
--- a/spec/features/merge_requests/update_merge_requests_spec.rb
+++ b/spec/features/merge_requests/update_merge_requests_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 feature 'Multiple merge requests updating from merge_requests#index', feature: true do
-  include WaitForAjax
-
   let!(:user)    { create(:user)}
   let!(:project) { create(:project) }
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
diff --git a/spec/features/merge_requests/user_posts_notes.rb b/spec/features/merge_requests/user_posts_notes_spec.rb
index c7cc4d6bc72..c7cc4d6bc72 100644
--- a/spec/features/merge_requests/user_posts_notes.rb
+++ b/spec/features/merge_requests/user_posts_notes_spec.rb
diff --git a/spec/features/merge_requests/user_uses_slash_commands_spec.rb b/spec/features/merge_requests/user_uses_slash_commands_spec.rb
index a1f4eb2688b..1c0f21e5616 100644
--- a/spec/features/merge_requests/user_uses_slash_commands_spec.rb
+++ b/spec/features/merge_requests/user_uses_slash_commands_spec.rb
@@ -2,7 +2,6 @@ require 'rails_helper'
 
 feature 'Merge Requests > User uses slash commands', feature: true, js: true do
   include SlashCommandsHelpers
-  include WaitForAjax
 
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
diff --git a/spec/features/merge_requests/widget_deployments_spec.rb b/spec/features/merge_requests/widget_deployments_spec.rb
index 6676821b807..00d191ddf2c 100644
--- a/spec/features/merge_requests/widget_deployments_spec.rb
+++ b/spec/features/merge_requests/widget_deployments_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Widget Deployments Header', feature: true, js: true do
-  include WaitForAjax
-
   describe 'when deployed to an environment' do
     given(:user) { create(:user) }
     given(:project) { merge_request.target_project }
diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb
index 4e128cd4a7d..d918181a238 100644
--- a/spec/features/merge_requests/widget_spec.rb
+++ b/spec/features/merge_requests/widget_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 describe 'Merge request', :feature, :js do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:project) { create(:project) }
   let(:merge_request) { create(:merge_request, source_project: project) }
diff --git a/spec/features/milestone_spec.rb b/spec/features/milestone_spec.rb
index c3297de709a..c07de01c594 100644
--- a/spec/features/milestone_spec.rb
+++ b/spec/features/milestone_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 feature 'Milestone', feature: true do
-  include WaitForAjax
-
   let(:project) { create(:empty_project, :public) }
   let(:user)   { create(:user) }
 
diff --git a/spec/features/milestones/milestones_spec.rb b/spec/features/milestones/milestones_spec.rb
index 2fa3e72ab08..50d7ca39045 100644
--- a/spec/features/milestones/milestones_spec.rb
+++ b/spec/features/milestones/milestones_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe 'Milestone draggable', feature: true, js: true do
-  include WaitForAjax
   include DragTo
 
   let(:milestone) { create(:milestone, project: project, title: 8.14) }
diff --git a/spec/features/participants_autocomplete_spec.rb b/spec/features/participants_autocomplete_spec.rb
index decad589c23..449ce80bc71 100644
--- a/spec/features/participants_autocomplete_spec.rb
+++ b/spec/features/participants_autocomplete_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 feature 'Member autocomplete', :js do
-  let(:project) { create(:project, :public) }
+  let(:project) { create(:empty_project, :public) }
   let(:user) { create(:user) }
   let(:author) { create(:user) }
   let(:note) { create(:note, noteable: noteable, project: noteable.project) }
@@ -36,6 +36,7 @@ feature 'Member autocomplete', :js do
   end
 
   context 'adding a new note on a Merge Request' do
+    let(:project) { create(:project, :public, :repository) }
     let(:noteable) do
       create(:merge_request, source_project: project,
                              target_project: project, author: author)
@@ -48,6 +49,7 @@ feature 'Member autocomplete', :js do
   end
 
   context 'adding a new note on a Commit' do
+    let(:project) { create(:project, :public, :repository) }
     let(:noteable) { project.commit }
     let(:note) { create(:note_on_commit, project: project, commit_id: project.commit.id) }
 
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index 01cd268ffe8..7cfa5b9716f 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'File blob', feature: true do
-  include WaitForAjax
   include TreeHelper
 
   let(:project) { create(:project, :public, :test_repo) }
diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb
index aab5a72678e..cc5b1a7e734 100644
--- a/spec/features/projects/blobs/edit_spec.rb
+++ b/spec/features/projects/blobs/edit_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'Editing file blob', feature: true, js: true do
-  include WaitForAjax
   include TreeHelper
 
   let(:project) { create(:project, :public, :test_repo) }
diff --git a/spec/features/projects/blobs/user_create_spec.rb b/spec/features/projects/blobs/user_create_spec.rb
index 6ea149956fe..d805450e095 100644
--- a/spec/features/projects/blobs/user_create_spec.rb
+++ b/spec/features/projects/blobs/user_create_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'New blob creation', feature: true, js: true do
-  include WaitForAjax
   include TargetBranchHelpers
 
   given(:user) { create(:user) }
diff --git a/spec/features/projects/commit/cherry_pick_spec.rb b/spec/features/projects/commit/cherry_pick_spec.rb
index 0b972d2a439..5d64d42fd61 100644
--- a/spec/features/projects/commit/cherry_pick_spec.rb
+++ b/spec/features/projects/commit/cherry_pick_spec.rb
@@ -1,5 +1,4 @@
 require 'spec_helper'
-include WaitForAjax
 
 describe 'Cherry-pick Commits' do
   let(:group) { create(:group) }
diff --git a/spec/features/projects/commit/mini_pipeline_graph_spec.rb b/spec/features/projects/commit/mini_pipeline_graph_spec.rb
index 30a2b2bcf8c..98c0f2c63b0 100644
--- a/spec/features/projects/commit/mini_pipeline_graph_spec.rb
+++ b/spec/features/projects/commit/mini_pipeline_graph_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 feature 'Mini Pipeline Graph in Commit View', :js, :feature do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
diff --git a/spec/features/projects/edit_spec.rb b/spec/features/projects/edit_spec.rb
index 7c319af893b..a263781c43c 100644
--- a/spec/features/projects/edit_spec.rb
+++ b/spec/features/projects/edit_spec.rb
@@ -1,8 +1,6 @@
 require 'rails_helper'
 
 feature 'Project edit', feature: true, js: true do
-  include WaitForAjax
-
   let(:user)    { create(:user) }
   let(:project) { create(:project) }
 
diff --git a/spec/features/projects/features_visibility_spec.rb b/spec/features/projects/features_visibility_spec.rb
index 9079350186d..b080a8d500e 100644
--- a/spec/features/projects/features_visibility_spec.rb
+++ b/spec/features/projects/features_visibility_spec.rb
@@ -1,9 +1,6 @@
 require 'spec_helper'
-include WaitForAjax
 
 describe 'Edit Project Settings', feature: true do
-  include WaitForAjax
-
   let(:member) { create(:user) }
   let!(:project) { create(:project, :public, path: 'gitlab', name: 'sample') }
   let!(:issue) { create(:issue, project: project) }
diff --git a/spec/features/projects/files/creating_a_file_spec.rb b/spec/features/projects/files/creating_a_file_spec.rb
index de6905f2b58..69744ac3948 100644
--- a/spec/features/projects/files/creating_a_file_spec.rb
+++ b/spec/features/projects/files/creating_a_file_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'User wants to create a file', feature: true do
-  include WaitForAjax
-
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 
diff --git a/spec/features/projects/files/dockerfile_dropdown_spec.rb b/spec/features/projects/files/dockerfile_dropdown_spec.rb
index 32f33a3ca97..a7cc98a2059 100644
--- a/spec/features/projects/files/dockerfile_dropdown_spec.rb
+++ b/spec/features/projects/files/dockerfile_dropdown_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'User wants to add a Dockerfile file', feature: true do
-  include WaitForAjax
-
   before do
     user = create(:user)
     project = create(:project)
diff --git a/spec/features/projects/files/editing_a_file_spec.rb b/spec/features/projects/files/editing_a_file_spec.rb
index 4da34108b46..7a3afafec29 100644
--- a/spec/features/projects/files/editing_a_file_spec.rb
+++ b/spec/features/projects/files/editing_a_file_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'User wants to edit a file', feature: true do
-  include WaitForAjax
-
   let(:project) { create(:project) }
   let(:user) { create(:user) }
   let(:commit_params) do
diff --git a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
index 10b91d8990b..5c8105de4cb 100644
--- a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
+++ b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'User views files page', feature: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:project) { create(:forked_project_with_submodules) }
 
diff --git a/spec/features/projects/files/find_file_keyboard_spec.rb b/spec/features/projects/files/find_file_keyboard_spec.rb
index 582349d8d5b..e7a6749d8ac 100644
--- a/spec/features/projects/files/find_file_keyboard_spec.rb
+++ b/spec/features/projects/files/find_file_keyboard_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Find file keyboard shortcuts', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:project) { create(:project) }
 
diff --git a/spec/features/projects/files/gitignore_dropdown_spec.rb b/spec/features/projects/files/gitignore_dropdown_spec.rb
index 9ebef505b92..e59428f8b24 100644
--- a/spec/features/projects/files/gitignore_dropdown_spec.rb
+++ b/spec/features/projects/files/gitignore_dropdown_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'User wants to add a .gitignore file', feature: true do
-  include WaitForAjax
-
   before do
     user = create(:user)
     project = create(:project)
diff --git a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
index fca40f68b01..85b66b93fba 100644
--- a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
+++ b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'User wants to add a .gitlab-ci.yml file', feature: true do
-  include WaitForAjax
-
   before do
     user = create(:user)
     project = create(:project)
diff --git a/spec/features/projects/files/project_owner_creates_license_file_spec.rb b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
index 8ff0f5898ec..249830921ac 100644
--- a/spec/features/projects/files/project_owner_creates_license_file_spec.rb
+++ b/spec/features/projects/files/project_owner_creates_license_file_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'project owner creates a license file', feature: true, js: true do
-  include WaitForAjax
-
   let(:project_master) { create(:user) }
   let(:project) { create(:project) }
   background do
diff --git a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
index 1a1910455a1..70a41886985 100644
--- a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
+++ b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'project owner sees a link to create a license file in empty project', feature: true, js: true do
-  include WaitForAjax
-
   let(:project_master) { create(:user) }
   let(:project) { create(:empty_project) }
   background do
diff --git a/spec/features/projects/files/undo_template_spec.rb b/spec/features/projects/files/undo_template_spec.rb
index c51851d3f94..cd3af0b7d29 100644
--- a/spec/features/projects/files/undo_template_spec.rb
+++ b/spec/features/projects/files/undo_template_spec.rb
@@ -1,26 +1,25 @@
 require 'spec_helper'
-include WaitForAjax
 
-feature 'Template Undo Button', js: true do 
+feature 'Template Undo Button', js: true do
   let(:project) { create(:project) }
   let(:user) { create(:user) }
 
   before do
     project.team << [user, :master]
-    login_as user  
+    login_as user
   end
-  
-  context 'editing a matching file and applying a template' do 
+
+  context 'editing a matching file and applying a template' do
     before do
-      visit namespace_project_edit_blob_path(project.namespace, project, File.join(project.default_branch, "LICENSE"))      
+      visit namespace_project_edit_blob_path(project.namespace, project, File.join(project.default_branch, "LICENSE"))
       select_file_template('.js-license-selector', 'Apache License 2.0')
     end
-    
+
     scenario 'reverts template application' do
       try_template_undo('http://www.apache.org/licenses/', 'Apply a license template')
     end
   end
-  
+
   context 'creating a non-matching file' do 
     before do
       visit namespace_project_new_blob_path(project.namespace, project, 'master')
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index 6cdca0f114b..d28a853bbc2 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'issuable templates', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
diff --git a/spec/features/projects/labels/update_prioritization_spec.rb b/spec/features/projects/labels/update_prioritization_spec.rb
index 1e900d7e660..836f81fb16d 100644
--- a/spec/features/projects/labels/update_prioritization_spec.rb
+++ b/spec/features/projects/labels/update_prioritization_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'Prioritize labels', feature: true do
-  include WaitForAjax
   include DragTo
 
   let(:user)     { create(:user) }
diff --git a/spec/features/projects/members/group_links_spec.rb b/spec/features/projects/members/group_links_spec.rb
index cffb935ad5a..ab2b089db2e 100644
--- a/spec/features/projects/members/group_links_spec.rb
+++ b/spec/features/projects/members/group_links_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Projects > Members > Anonymous user sees members', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let(:group) { create(:group, :public) }
   let(:project) { create(:empty_project, :public) }
diff --git a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
index c3f45be6e4b..19d14ad9af4 100644
--- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
+++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'Projects > Members > Master adds member with expiration date', feature: true, js: true do
-  include WaitForAjax
   include Select2Helper
   include ActiveSupport::Testing::TimeHelpers
 
diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb
index de25d45f447..1bf8f710b9f 100644
--- a/spec/features/projects/members/user_requests_access_spec.rb
+++ b/spec/features/projects/members/user_requests_access_spec.rb
@@ -31,6 +31,17 @@ feature 'Projects > Members > User requests access', feature: true do
     expect(page).not_to have_content 'Leave Project'
   end
 
+  context 'code access is restricted' do
+    scenario 'user can request access' do
+      project.project_feature.update!(repository_access_level: ProjectFeature::PRIVATE,
+                                      builds_access_level: ProjectFeature::PRIVATE,
+                                      merge_requests_access_level: ProjectFeature::PRIVATE)
+      visit namespace_project_path(project.namespace, project)
+
+      expect(page).to have_content 'Request Access'
+    end
+  end
+
   scenario 'user is not listed in the project members page' do
     click_link 'Request Access'
 
diff --git a/spec/features/projects/ref_switcher_spec.rb b/spec/features/projects/ref_switcher_spec.rb
index 3b8f0b2d3f8..881ad7910dd 100644
--- a/spec/features/projects/ref_switcher_spec.rb
+++ b/spec/features/projects/ref_switcher_spec.rb
@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 feature 'Ref switcher', feature: true, js: true do
-  include WaitForAjax
   let(:user)      { create(:user) }
   let(:project)   { create(:project, :public) }
 
diff --git a/spec/features/projects/user_create_dir_spec.rb b/spec/features/projects/user_create_dir_spec.rb
index 2065abfb248..5dfdc465d7d 100644
--- a/spec/features/projects/user_create_dir_spec.rb
+++ b/spec/features/projects/user_create_dir_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature 'New directory creation', feature: true, js: true do
-  include WaitForAjax
   include TargetBranchHelpers
 
   given(:user) { create(:user) }
diff --git a/spec/features/projects/view_on_env_spec.rb b/spec/features/projects/view_on_env_spec.rb
index 34c6a10950f..b7a41ca54e6 100644
--- a/spec/features/projects/view_on_env_spec.rb
+++ b/spec/features/projects/view_on_env_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'View on environment', js: true do
-  include WaitForAjax
-
   let(:branch_name) { 'feature' }
   let(:file_path) { 'files/ruby/feature.rb' }
   let(:project) { create(:project, :repository) }
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index ba56030e28d..060e19596ae 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'Project', feature: true do
   describe 'description' do
-    let(:project) { create(:project) }
+    let(:project) { create(:project, :repository) }
     let(:path)    { namespace_project_path(project.namespace, project) }
 
     before do
@@ -36,7 +36,7 @@ feature 'Project', feature: true do
 
   describe 'remove forked relationship', js: true do
     let(:user)    { create(:user) }
-    let(:project) { create(:project, namespace: user.namespace) }
+    let(:project) { create(:empty_project, namespace: user.namespace) }
 
     before do
       login_with user
@@ -57,7 +57,7 @@ feature 'Project', feature: true do
 
   describe 'removal', js: true do
     let(:user)    { create(:user, username: 'test', name: 'test') }
-    let(:project) { create(:project, namespace: user.namespace, name: 'project1') }
+    let(:project) { create(:empty_project, namespace: user.namespace, name: 'project1') }
 
     before do
       login_with(user)
@@ -75,10 +75,8 @@ feature 'Project', feature: true do
   end
 
   describe 'project title' do
-    include WaitForAjax
-
     let(:user)    { create(:user) }
-    let(:project) { create(:project, namespace: user.namespace) }
+    let(:project) { create(:empty_project, namespace: user.namespace) }
 
     before do
       login_with(user)
@@ -94,8 +92,8 @@ feature 'Project', feature: true do
 
   describe 'project title' do
     let(:user)    { create(:user) }
-    let(:project) { create(:project, namespace: user.namespace) }
-    let(:project2) { create(:project, namespace: user.namespace, path: 'test') }
+    let(:project) { create(:empty_project, namespace: user.namespace) }
+    let(:project2) { create(:empty_project, namespace: user.namespace, path: 'test') }
     let(:issue) { create(:issue, project: project) }
 
     context 'on issues page', js: true do
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb
index 1a3f7b970f6..acc5641f930 100644
--- a/spec/features/protected_branches_spec.rb
+++ b/spec/features/protected_branches_spec.rb
@@ -2,10 +2,8 @@ require 'spec_helper'
 Dir["./spec/features/protected_branches/*.rb"].sort.each { |f| require f }
 
 feature 'Projected Branches', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user, :admin) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
 
   before { login_as(user) }
 
diff --git a/spec/features/protected_tags_spec.rb b/spec/features/protected_tags_spec.rb
index 09e8c850de3..e3aa87ded28 100644
--- a/spec/features/protected_tags_spec.rb
+++ b/spec/features/protected_tags_spec.rb
@@ -2,10 +2,8 @@ require 'spec_helper'
 Dir["./spec/features/protected_tags/*.rb"].sort.each { |f| require f }
 
 feature 'Projected Tags', feature: true, js: true do
-  include WaitForAjax
-
   let(:user) { create(:user, :admin) }
-  let(:project) { create(:project) }
+  let(:project) { create(:project, :repository) }
 
   before { login_as(user) }
 
diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb
index e8ad28a00f0..da6388dcdf2 100644
--- a/spec/features/search_spec.rb
+++ b/spec/features/search_spec.rb
@@ -2,10 +2,9 @@ require 'spec_helper'
 
 describe "Search", feature: true  do
   include FilteredSearchHelpers
-  include WaitForAjax
 
   let(:user) { create(:user) }
-  let(:project) { create(:project, namespace: user.namespace) }
+  let(:project) { create(:empty_project, namespace: user.namespace) }
   let!(:issue) { create(:issue, project: project, assignee: user) }
   let!(:issue2) { create(:issue, project: project, author: user) }
 
@@ -62,6 +61,7 @@ describe "Search", feature: true  do
 
   context 'search for comments' do
     context 'when comment belongs to a invalid commit' do
+      let(:project) { create(:project, :repository) }
       let(:note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'Bug here') }
 
       before { note.update_attributes(commit_id: 12345678) }
@@ -103,6 +103,7 @@ describe "Search", feature: true  do
     end
 
     it 'finds a commit' do
+      project = create(:project, :repository) { |p| p.add_reporter(user) }
       visit namespace_project_path(project.namespace, project)
 
       page.within '.search' do
@@ -116,6 +117,7 @@ describe "Search", feature: true  do
     end
 
     it 'finds a code' do
+      project = create(:project, :repository) { |p| p.add_reporter(user) }
       visit namespace_project_path(project.namespace, project)
 
       page.within '.search' do
@@ -222,6 +224,8 @@ describe "Search", feature: true  do
   end
 
   describe 'search for commits' do
+    let(:project) { create(:project, :repository) }
+
     before do
       visit search_path(project_id: project.id)
     end
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
index 3c341fef253..3858f4d8959 100644
--- a/spec/features/task_lists_spec.rb
+++ b/spec/features/task_lists_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 feature 'Task Lists', feature: true do
   include Warden::Test::Helpers
 
-  let(:project) { create(:project) }
+  let(:project) { create(:empty_project) }
   let(:user)    { create(:user) }
   let(:user2)   { create(:user) }
 
@@ -255,6 +255,7 @@ feature 'Task Lists', feature: true do
     end
 
     describe 'multiple tasks' do
+      let(:project) { create(:project, :repository) }
       let!(:merge) { create(:merge_request, :simple, description: markdown, author: user, source_project: project) }
 
       it 'renders for description' do
diff --git a/spec/features/todos/todos_filtering_spec.rb b/spec/features/todos/todos_filtering_spec.rb
index e8f06916d53..cecb98641a6 100644
--- a/spec/features/todos/todos_filtering_spec.rb
+++ b/spec/features/todos/todos_filtering_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Dashboard > User filters todos', feature: true, js: true do
-  include WaitForAjax
-
   let(:user_1)    { create(:user, username: 'user_1', name: 'user_1') }
   let(:user_2)    { create(:user, username: 'user_2', name: 'user_2') }
 
diff --git a/spec/features/todos/todos_spec.rb b/spec/features/todos/todos_spec.rb
index c270511c903..50c207fb9cb 100644
--- a/spec/features/todos/todos_spec.rb
+++ b/spec/features/todos/todos_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Dashboard Todos', feature: true do
-  include WaitForAjax
-
   let(:user)    { create(:user) }
   let(:author)  { create(:user) }
   let(:project) { create(:project, visibility_level: Gitlab::VisibilityLevel::PUBLIC) }
diff --git a/spec/features/u2f_spec.rb b/spec/features/u2f_spec.rb
index c877cfdd978..544d2dcb87f 100644
--- a/spec/features/u2f_spec.rb
+++ b/spec/features/u2f_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 feature 'Using U2F (Universal 2nd Factor) Devices for Authentication', :js do
-  include WaitForAjax
-
   before { allow_any_instance_of(U2fHelper).to receive(:inject_u2f_api?).and_return(true) }
 
   def manage_two_factor_authentication
diff --git a/spec/features/users/projects_spec.rb b/spec/features/users/projects_spec.rb
index 1d75fe434b0..373b64808f8 100644
--- a/spec/features/users/projects_spec.rb
+++ b/spec/features/users/projects_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Projects tab on a user profile', :feature, :js do
-  include WaitForAjax
-
   let(:user) { create(:user) }
   let!(:project) { create(:empty_project, namespace: user.namespace) }
   let!(:project2) { create(:empty_project, namespace: user.namespace) }
diff --git a/spec/features/users/snippets_spec.rb b/spec/features/users/snippets_spec.rb
index ce7e809ec76..1546a06b80c 100644
--- a/spec/features/users/snippets_spec.rb
+++ b/spec/features/users/snippets_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'Snippets tab on a user profile', feature: true, js: true do
-  include WaitForAjax
-
   context 'when the user has snippets' do
     let(:user) { create(:user) }
     let!(:snippets) { create_list(:snippet, 2, :public, author: user) }
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 2de0fbe7ab2..c43feadc808 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -68,7 +68,6 @@ feature 'Users', feature: true, js: true do
   end
 
   feature 'username validation' do
-    include WaitForAjax
     let(:loading_icon) { '.fa.fa-spinner' }
     let(:username_input) { 'new_user_username' }
 
diff --git a/spec/features/variables_spec.rb b/spec/features/variables_spec.rb
index a362d6fd3b6..b83a230c1f8 100644
--- a/spec/features/variables_spec.rb
+++ b/spec/features/variables_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'Project variables', js: true do
   let(:user)     { create(:user) }
-  let(:project)  { create(:project) }
+  let(:project)  { create(:empty_project) }
   let(:variable) { create(:ci_variable, key: 'test_key', value: 'test value') }
 
   before do