Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules

* upstream/master: (1723 commits)
  Resolve "Editor icons"
  Refactor issuable destroy action
  Ignore routes matching legacy_*_redirect in route specs
  Gitlab::Git::RevList and LfsChanges use lazy popen
  Gitlab::Git::Popen can lazily hand output to a block
  Merge branch 'master-i18n' into 'master'
  Remove unique validation from external_url in Environment
  Expose `duration` in Job API entity
  Add TimeCop freeze for DST and Regular time
  Harcode project visibility
  update a changelog
  Put a condition to old migration that adds fast_forward column to MRs
  Expose project visibility as CI variable
  fix flaky tests by removing unneeded clicks and focus actions
  fix flaky test in gfm_autocomplete_spec.rb
  Use Gitlab::Git operations for repository mirroring
  Encapsulate git operations for mirroring in Gitlab::Git
  Create a Wiki Repository's raw_repository properly
  Add `Gitlab::Git::Repository#fetch` command
  Fix Gitlab::Metrics::System#real_time and #monotonic_time doc
  ...

25 files changed, 169 insertions, 1348 deletions

diff --git a/features/explore/groups.feature b/features/explore/groups.feature
index 9eacbe0b25e..830810615e0 100644
--- a/features/explore/groups.feature
+++ b/features/explore/groups.feature
@@ -3,6 +3,7 @@ Feature: Explore Groups
   Background:
     Given group "TestGroup" has private project "Enterprise"
 
+  @javascript
   Scenario: I should see group with private and internal projects as user
     Given group "TestGroup" has internal project "Internal"
     When I sign in as a user
@@ -10,6 +11,7 @@ Feature: Explore Groups
     Then I should see project "Internal" items
     And I should not see project "Enterprise" items
 
+  @javascript
   Scenario: I should see group issues for internal project as user
     Given group "TestGroup" has internal project "Internal"
     When I sign in as a user
@@ -17,6 +19,7 @@ Feature: Explore Groups
     Then I should see project "Internal" items
     And I should not see project "Enterprise" items
 
+  @javascript
   Scenario: I should see group merge requests for internal project as user
     Given group "TestGroup" has internal project "Internal"
     When I sign in as a user
@@ -24,6 +27,7 @@ Feature: Explore Groups
     Then I should see project "Internal" items
     And I should not see project "Enterprise" items
 
+  @javascript
   Scenario: I should see group with private, internal and public projects as visitor
     Given group "TestGroup" has internal project "Internal"
     Given group "TestGroup" has public project "Community"
@@ -32,6 +36,7 @@ Feature: Explore Groups
     And I should not see project "Internal" items
     And I should not see project "Enterprise" items
 
+  @javascript
   Scenario: I should see group issues for public project as visitor
     Given group "TestGroup" has internal project "Internal"
     Given group "TestGroup" has public project "Community"
@@ -40,6 +45,7 @@ Feature: Explore Groups
     And I should not see project "Internal" items
     And I should not see project "Enterprise" items
 
+  @javascript
   Scenario: I should see group merge requests for public project as visitor
     Given group "TestGroup" has internal project "Internal"
     Given group "TestGroup" has public project "Community"
@@ -48,6 +54,7 @@ Feature: Explore Groups
     And I should not see project "Internal" items
     And I should not see project "Enterprise" items
 
+  @javascript
   Scenario: I should see group with private, internal and public projects as user
     Given group "TestGroup" has internal project "Internal"
     Given group "TestGroup" has public project "Community"
@@ -57,6 +64,7 @@ Feature: Explore Groups
     And I should see project "Internal" items
     And I should not see project "Enterprise" items
 
+  @javascript
   Scenario: I should see group issues for internal and public projects as user
     Given group "TestGroup" has internal project "Internal"
     Given group "TestGroup" has public project "Community"
@@ -66,6 +74,7 @@ Feature: Explore Groups
     And I should see project "Internal" items
     And I should not see project "Enterprise" items
 
+  @javascript
   Scenario: I should see group merge requests for internal and public projects as user
     Given group "TestGroup" has internal project "Internal"
     Given group "TestGroup" has public project "Community"
@@ -75,17 +84,20 @@ Feature: Explore Groups
     And I should see project "Internal" items
     And I should not see project "Enterprise" items
 
+  @javascript
   Scenario: I should see group with public project in public groups area
     Given group "TestGroup" has public project "Community"
     When I visit the public groups area
     Then I should see group "TestGroup"
 
+  @javascript
   Scenario: I should see group with public project in public groups area as user
     Given group "TestGroup" has public project "Community"
     When I sign in as a user
     And I visit the public groups area
     Then I should see group "TestGroup"
 
+  @javascript
   Scenario: I should see group with internal project in public groups area as user
     Given group "TestGroup" has internal project "Internal"
     When I sign in as a user
diff --git a/features/explore/projects.feature b/features/explore/projects.feature
deleted file mode 100644
index 4e0f4486ab7..00000000000
--- a/features/explore/projects.feature
+++ /dev/null
@@ -1,144 +0,0 @@
-@public
-Feature: Explore Projects
-  Background:
-    Given public project "Community"
-    And internal project "Internal"
-    And private project "Enterprise"
-
-  Scenario: I visit public area
-    Given archived project "Archive"
-    When I visit the public projects area
-    Then I should see project "Community"
-    And I should not see project "Internal"
-    And I should not see project "Enterprise"
-    And I should not see project "Archive"
-
-  Scenario: I visit public project page
-    When I visit project "Community" page
-    Then I should see project "Community" home page
-
-  Scenario: I visit internal project page
-    When I visit project "Internal" page
-    Then I should be redirected to sign in page
-
-  Scenario: I visit private project page
-    When I visit project "Enterprise" page
-    Then I should be redirected to sign in page
-
-  Scenario: I visit an empty public project page
-    Given public empty project "Empty Public Project"
-    When I visit empty project page
-    Then I should see empty public project details
-    And I should see empty public project details with http clone info
-
-  Scenario: I visit an empty public project page as user with no ssh-keys
-    Given I sign in as a user
-    And I have no ssh keys
-    And public empty project "Empty Public Project"
-    When I visit empty project page
-    Then I should see empty public project details
-    And I should see empty public project details with http clone info
-
-  Scenario: I visit an empty public project page as user with an ssh-key
-    Given I sign in as a user
-    And I have an ssh key
-    And public empty project "Empty Public Project"
-    When I visit empty project page
-    Then I should see empty public project details
-    And I should see empty public project details with ssh clone info
-
-  Scenario: I visit public area as user
-    Given archived project "Archive"
-    And I sign in as a user
-    When I visit the public projects area
-    Then I should see project "Community"
-    And I should see project "Internal"
-    And I should not see project "Enterprise"
-    And I should not see project "Archive"
-
-  Scenario: I visit internal project page as user
-    Given I sign in as a user
-    When I visit project "Internal" page
-    Then I should see project "Internal" home page
-
-  Scenario: I visit public project page
-    When I visit project "Community" page
-    Then I should see project "Community" home page
-    And I should see an http link to the repository
-
-  Scenario: I visit public project page as user with no ssh-keys
-    Given I sign in as a user
-    And I have no ssh keys
-    When I visit project "Community" page
-    Then I should see project "Community" home page
-    And I should see an http link to the repository
-
-  Scenario: I visit public project page as user with an ssh-key
-    Given I sign in as a user
-    And I have an ssh key
-    When I visit project "Community" page
-    Then I should see project "Community" home page
-    And I should see an ssh link to the repository
-
-  Scenario: I visit an empty public project page
-    Given public empty project "Empty Public Project"
-    When I visit empty project page
-    Then I should see empty public project details
-
-  Scenario: I visit public project issues page as a non authorized user
-    Given I visit project "Community" page
-    Then I should not see command line instructions
-    And I visit "Community" issues page
-    Then I should see list of issues for "Community" project
-
-  Scenario: I visit public project issues page as authorized user
-    Given I sign in as a user
-    Given I visit project "Community" page
-    And I visit "Community" issues page
-    Then I should see list of issues for "Community" project
-
-  Scenario: I visit internal project issues page as authorized user
-    Given I sign in as a user
-    Given I visit project "Internal" page
-    And I visit "Internal" issues page
-    Then I should see list of issues for "Internal" project
-
-  Scenario: I visit public project merge requests page as an authorized user
-    Given I sign in as a user
-    Given I visit project "Community" page
-    And I visit "Community" merge requests page
-    And project "Community" has "Bug fix" open merge request
-    Then I should see list of merge requests for "Community" project
-
-  Scenario: I visit public project merge requests page as a non authorized user
-    Given I visit project "Community" page
-    And I visit "Community" merge requests page
-    And project "Community" has "Bug fix" open merge request
-    Then I should see list of merge requests for "Community" project
-
-  Scenario: I visit internal project merge requests page as an authorized user
-    Given I sign in as a user
-    Given I visit project "Internal" page
-    And I visit "Internal" merge requests page
-    And project "Internal" has "Feature implemented" open merge request
-    Then I should see list of merge requests for "Internal" project
-
-  Scenario: Trending page
-    Given archived project "Archive"
-    And project "Archive" has comments
-    And I sign in as a user
-    And project "Community" has comments
-    And trending projects are refreshed
-    When I visit the explore trending projects
-    Then I should see project "Community"
-    And I should not see project "Internal"
-    And I should not see project "Enterprise"
-    And I should not see project "Archive"
-
-  Scenario: Most starred page
-    Given archived project "Archive"
-    And I sign in as a user
-    When I visit the explore starred projects
-    Then I should see project "Community"
-    And I should see project "Internal"
-    And I should not see project "Archive"
diff --git a/features/project/ff_merge_requests.feature b/features/project/ff_merge_requests.feature
new file mode 100644
index 00000000000..995e52f9332
--- /dev/null
+++ b/features/project/ff_merge_requests.feature
@@ -0,0 +1,24 @@
+Feature: Project Ff Merge Requests
+  Background:
+    Given I sign in as a user
+    And I own project "Shop"
+    And project "Shop" have "Bug NS-05" open merge request with diffs inside
+    And merge request "Bug NS-05" is mergeable
+
+  @javascript
+  Scenario: I do ff-only merge for rebased branch
+    Given ff merge enabled
+    And merge request "Bug NS-05" is rebased
+    When I visit merge request page "Bug NS-05"
+    Then I should see ff-only merge button
+    When I accept this merge request
+    Then I should see merged request
+
+  @javascript
+  Scenario: I do ff-only merge for merged branch
+    Given ff merge enabled
+    And merge request "Bug NS-05" merged target
+    When I visit merge request page "Bug NS-05"
+    Then I should see ff-only merge button
+    When I accept this merge request
+    Then I should see merged request
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index 4f905674d8c..d6cfa524a3a 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -51,36 +51,34 @@ Feature: Project Issues
   @javascript
   Scenario: Visiting Issues after being sorted the list
     Given I visit project "Shop" issues page
-    And I sort the list by "Oldest updated"
+    And I sort the list by "Last updated"
     And I visit my project's home page
     And I visit project "Shop" issues page
-    Then The list should be sorted by "Oldest updated"
+    Then The list should be sorted by "Last updated"
 
   @javascript
   Scenario: Visiting Merge Requests after being sorted the list
     Given project "Shop" has a "Bugfix MR" merge request open
     And I visit project "Shop" issues page
-    And I sort the list by "Oldest updated"
+    And I sort the list by "Last updated"
     And I visit project "Shop" merge requests page
-    Then The list should be sorted by "Oldest updated"
+    Then The list should be sorted by "Last updated"
 
   @javascript
   Scenario: Visiting Merge Requests from a differente Project after sorting
     Given project "Shop" has a "Bugfix MR" merge request open
     And I visit project "Shop" merge requests page
-    And I sort the list by "Oldest updated"
+    And I sort the list by "Last updated"
     And I visit dashboard merge requests page
-    Then The list should be sorted by "Oldest updated"
+    Then The list should be sorted by "Last updated"
 
   @javascript
   Scenario: Sort issues by upvotes/downvotes
     Given project "Shop" have "Bugfix" open issue
     And issue "Release 0.4" have 2 upvotes and 1 downvote
     And issue "Tweet control" have 1 upvote and 2 downvotes
-    And I sort the list by "Most popular"
-    Then The list should be sorted by "Most popular"
-    And I sort the list by "Least popular"
-    Then The list should be sorted by "Least popular"
+    And I sort the list by "Popularity"
+    Then The list should be sorted by "Popularity"
 
   # Markdown
 
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
deleted file mode 100644
index 0ebeded7fc5..00000000000
--- a/features/project/merge_requests.feature
+++ /dev/null
@@ -1,326 +0,0 @@
-@project_merge_requests
-Feature: Project Merge Requests
-  Background:
-    Given I sign in as a user
-    And I own project "Shop"
-    And project "Shop" have "Bug NS-04" open merge request
-    And project "Shop" have "Feature NS-03" closed merge request
-    And I visit project "Shop" merge requests page
-
-  Scenario: I should see open merge requests
-    Then I should see "Bug NS-04" in merge requests
-    And I should not see "Feature NS-03" in merge requests
-
-  Scenario: I should see CI status for merge requests
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    Given "Bug NS-05" has CI status
-    When I visit project "Shop" merge requests page
-    Then I should see merge request "Bug NS-05" with CI status
-
-  Scenario: I should not see target branch name when it is project's default branch
-    Then I should see "Bug NS-04" in merge requests
-    And I should not see "master" branch
-
-  Scenario: I should see target branch when it is different from default
-    Given project "Shop" have "Bug NS-06" open merge request
-    When I visit project "Shop" merge requests page
-    Then I should see "feature_conflict" branch
-
-  @javascript
-  Scenario: I should not see the numbers of diverged commits if the branch is rebased on the target
-    Given project "Shop" have "Bug NS-07" open merge request with rebased branch
-    When I visit merge request page "Bug NS-07"
-    Then I should not see the diverged commits count
-
-  @javascript
-  Scenario: I should see the numbers of diverged commits if the branch diverged from the target
-    Given project "Shop" have "Bug NS-08" open merge request with diverged branch
-    When I visit merge request page "Bug NS-08"
-    Then I should see the diverged commits count
-
-  @javascript
-  Scenario: I should see rejected merge requests
-    Given I click link "Closed"
-    Then I should see "Feature NS-03" in merge requests
-    And I should not see "Bug NS-04" in merge requests
-
-  @javascript
-  Scenario: I should see all merge requests
-    Given I click link "All"
-    Then I should see "Feature NS-03" in merge requests
-    And I should see "Bug NS-04" in merge requests
-
-  @javascript
-  Scenario: I visit an open merge request page
-    Given I click link "Bug NS-04"
-    Then I should see merge request "Bug NS-04"
-
-  @javascript
-  Scenario: I visit a merged merge request page
-    Given project "Shop" have "Feature NS-05" merged merge request
-    And I click link "Merged"
-    And I click link "Feature NS-05"
-    Then I should see merge request "Feature NS-05"
-
-  @javascript
-  Scenario: I close merge request page
-    Given I click link "Bug NS-04"
-    And I click link "Close"
-    Then I should see closed merge request "Bug NS-04"
-
-  @javascript
-  Scenario: I reopen merge request page
-    Given I click link "Bug NS-04"
-    And I click link "Close"
-    Then I should see closed merge request "Bug NS-04"
-    When I click link "Reopen"
-    Then I should see reopened merge request "Bug NS-04"
-
-  @javascript
-  Scenario: I submit new unassigned merge request
-    Given I click link "New Merge Request"
-    And I submit new merge request "Wiki Feature"
-    Then I should see merge request "Wiki Feature"
-
-  @javascript
-  Scenario: I comment on a merge request
-    Given I visit merge request page "Bug NS-04"
-    And I leave a comment like "XML attached"
-    Then I should see comment "XML attached"
-
-  @javascript
-  Scenario: Visiting Merge Requests after being sorted the list
-    Given I visit project "Shop" merge requests page
-    And I sort the list by "Oldest updated"
-    And I visit my project's home page
-    And I visit project "Shop" merge requests page
-    Then The list should be sorted by "Oldest updated"
-
-  @javascript
-  Scenario: Visiting Merge Requests from a different Project after sorting
-    Given I visit project "Shop" merge requests page
-    And I sort the list by "Oldest updated"
-    And I visit dashboard merge requests page
-    Then The list should be sorted by "Oldest updated"
-
-  @javascript
-  Scenario: Sort merge requests by upvotes/downvotes
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And project "Shop" have "Bug NS-06" open merge request
-    And merge request "Bug NS-04" have 2 upvotes and 1 downvote
-    And merge request "Bug NS-06" have 1 upvote and 2 downvotes
-    And I sort the list by "Most popular"
-    Then The list should be sorted by "Most popular"
-    And I sort the list by "Least popular"
-    Then The list should be sorted by "Least popular"
-
-  @javascript
-  Scenario: I comment on a merge request diff
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I leave a comment like "Line is wrong" on diff
-    And I switch to the merge request's comments tab
-    Then I should see a discussion has started on diff
-    And I should see a badge of "1" next to the discussion link
-
-  @javascript
-  Scenario: I see a new comment on merge request diff from another user in the discussion tab
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And user "John Doe" leaves a comment like "Line is wrong" on diff
-    Then I should see a discussion by user "John Doe" has started on diff
-    And I should see a badge of "1" next to the discussion link
-
-  @javascript
-  Scenario: I edit a comment on a merge request diff
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I leave a comment like "Line is wrong" on diff
-    And I change the comment "Line is wrong" to "Typo, please fix" on diff
-    Then I should not see a diff comment saying "Line is wrong"
-    And I should see a diff comment saying "Typo, please fix"
-
-  @javascript
-  Scenario: I delete a comment on a merge request diff
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I leave a comment like "Line is wrong" on diff
-    And I should see a badge of "1" next to the discussion link
-    And I delete the comment "Line is wrong" on diff
-    And I click on the Discussion tab
-    Then I should not see any discussion
-    And I should see a badge of "0" next to the discussion link
-
-  @javascript
-  Scenario: I comment on a line of a commit in merge request
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the commit in the merge request
-    And I leave a comment like "Line is wrong" on diff in commit
-    And I switch to the merge request's comments tab
-    Then I should see a discussion has started on commit diff
-
-  @javascript
-  Scenario: I comment on a commit in merge request
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the commit in the merge request
-    And I leave a comment on the diff page in commit
-    And I switch to the merge request's comments tab
-    Then I should see a discussion has started on commit
-
-  @javascript
-  Scenario: I accept merge request with custom commit message
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And merge request "Bug NS-05" is mergeable
-    And I visit merge request page "Bug NS-05"
-    And merge request is mergeable
-    Then I modify merge commit message
-    And I accept this merge request
-    Then I should see merged request
-
-  # Markdown
-
-  @javascript
-  Scenario: Headers inside the description should have ids generated for them.
-    When I visit merge request page "Bug NS-04"
-    Then Header "Description header" should have correct id and link
-
-  @javascript
-  Scenario: Headers inside comments should not have ids generated for them.
-    Given I visit merge request page "Bug NS-04"
-    And I leave a comment with a header containing "Comment with a header"
-    Then The comment with the header should not have an ID
-
-  # Toggling inline comments
-
-  @javascript
-  Scenario: I hide comments on a merge request diff with comments in a single file
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I leave a comment like "Line is wrong" on line 39 of the third file
-    And I click link "Hide inline discussion" of the third file
-    Then I should not see a comment like "Line is wrong here" in the third file
-
-  @javascript
-  Scenario: I show comments on a merge request diff with comments in a single file
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I leave a comment like "Line is wrong" on line 39 of the third file
-    Then I should see a comment like "Line is wrong" in the third file
-
-  @javascript
-  Scenario: I hide comments on a merge request diff with comments in multiple files
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I leave a comment like "Line is correct" on line 12 of the second file
-    And I leave a comment like "Line is wrong" on line 39 of the third file
-    And I click link "Hide inline discussion" of the third file
-    Then I should not see a comment like "Line is wrong here" in the third file
-    And I should still see a comment like "Line is correct" in the second file
-
-  @javascript
-  Scenario: I show comments on a merge request diff with comments in multiple files
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I leave a comment like "Line is correct" on line 12 of the second file
-    And I leave a comment like "Line is wrong" on line 39 of the third file
-    And I click link "Hide inline discussion" of the third file
-    And I click link "Show inline discussion" of the third file
-    Then I should see a comment like "Line is wrong" in the third file
-    And I should still see a comment like "Line is correct" in the second file
-
-  @javascript
-  Scenario: I unfold diff
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I unfold diff
-    Then I should see additional file lines
-
-  @javascript
-  Scenario: I unfold diff in Side-by-Side view
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I click Side-by-side Diff tab
-    And I unfold diff
-    Then I should see additional file lines
-
-  @javascript
-  Scenario: I show comments on a merge request side-by-side diff with comments in multiple files
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    And I leave a comment like "Line is correct" on line 12 of the second file
-    And I leave a comment like "Line is wrong" on line 39 of the third file
-    And I click Side-by-side Diff tab
-    Then I should see comments on the side-by-side diff page
-
-  @javascript
-  Scenario: I view diffs on a merge request
-    Given project "Shop" have "Bug NS-05" open merge request with diffs inside
-    And I visit merge request page "Bug NS-05"
-    And I click on the Changes tab
-    Then I should see the proper Inline and Side-by-side links
-
-  # Description preview
-
-  @javascript
-  Scenario: I can't preview without text
-    Given I visit merge request page "Bug NS-04"
-    And I click link "Edit" for the merge request
-    And I haven't written any description text
-    Then The Markdown preview tab should say there is nothing to do
-
-  @javascript
-  Scenario: I can preview with text
-    Given I visit merge request page "Bug NS-04"
-    And I click link "Edit" for the merge request
-    And I write a description like ":+1: Nice"
-    Then The Markdown preview tab should display rendered Markdown
-
-  @javascript
-  Scenario: I preview a merge request description
-    Given I visit merge request page "Bug NS-04"
-    And I click link "Edit" for the merge request
-    And I preview a description text like "Bug fixed :smile:"
-    Then I should see the Markdown preview
-    And I should not see the Markdown text field
-
-  @javascript
-  Scenario: I can edit after preview
-    Given I visit merge request page "Bug NS-04"
-    And I click link "Edit" for the merge request
-    And I preview a description text like "Bug fixed :smile:"
-    Then I should see the Markdown write tab
-
-  @javascript
-  Scenario: I can unsubscribe from merge request
-    Given I visit merge request page "Bug NS-04"
-    Then I should see that I am subscribed
-    When I click button "Unsubscribe"
-    Then I should see that I am unsubscribed
-
-  @javascript
-  Scenario: I can change the target branch
-    Given I visit merge request page "Bug NS-04"
-    And I click link "Edit" for the merge request
-    When I click the "Target branch" dropdown
-    And I select a new target branch
-    Then I should see new target branch changes
-
-  @javascript
-  Scenario: I can close merge request after commenting
-    Given I visit merge request page "Bug NS-04"
-    And I leave a comment like "XML attached"
-    Then I should see comment "XML attached"
-    And I click link "Close"
-    Then I should see closed merge request "Bug NS-04"
diff --git a/features/steps/explore/projects.rb b/features/steps/explore/projects.rb
deleted file mode 100644
index 962e39dde9a..00000000000
--- a/features/steps/explore/projects.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include SharedProject
-  include SharedUser
-
-  step 'I should see project "Empty Public Project"' do
-    expect(page).to have_content "Empty Public Project"
-  end
-
-  step 'I should see public project details' do
-    expect(page).to have_content '32 branches'
-    expect(page).to have_content '16 tags'
-  end
-
-  step 'I should see project readme' do
-    expect(page).to have_content 'README.md'
-  end
-
-  step 'I should see empty public project details' do
-    expect(page).not_to have_content 'Git global setup'
-  end
-
-  step 'I should see empty public project details with http clone info' do
-    project = Project.find_by(name: 'Empty Public Project')
-    page.all(:css, '.git-empty .clone').each do |element|
-      expect(element.text).to include(project.http_url_to_repo)
-    end
-  end
-
-  step 'I should see empty public project details with ssh clone info' do
-    project = Project.find_by(name: 'Empty Public Project')
-    page.all(:css, '.git-empty .clone').each do |element|
-      expect(element.text).to include(project.url_to_repo)
-    end
-  end
-
-  step 'I should see project "Community" home page' do
-    page.within '.breadcrumbs .breadcrumb-item-text' do
-      expect(page).to have_content 'Community'
-    end
-  end
-
-  step 'I should see project "Internal" home page' do
-    page.within '.breadcrumbs .breadcrumb-item-text' do
-      expect(page).to have_content 'Internal'
-    end
-  end
-
-  step 'I should see an http link to the repository' do
-    project = Project.find_by(name: 'Community')
-    expect(page).to have_field('project_clone', with: project.http_url_to_repo)
-  end
-
-  step 'I should see an ssh link to the repository' do
-    project = Project.find_by(name: 'Community')
-    expect(page).to have_field('project_clone', with: project.url_to_repo)
-  end
-
-  step 'I visit "Community" issues page' do
-    create(:issue,
-       title: "Bug",
-       project: public_project
-          )
-    create(:issue,
-       title: "New feature",
-       project: public_project
-          )
-    visit project_issues_path(public_project)
-  end
-
-  step 'I should see list of issues for "Community" project' do
-    expect(page).to have_content "Bug"
-    expect(page).to have_content public_project.name
-    expect(page).to have_content "New feature"
-  end
-
-  step 'I visit "Internal" issues page' do
-    create(:issue,
-       title: "Internal Bug",
-       project: internal_project
-          )
-    create(:issue,
-       title: "New internal feature",
-       project: internal_project
-          )
-    visit project_issues_path(internal_project)
-  end
-
-  step 'I should see list of issues for "Internal" project' do
-    expect(page).to have_content "Internal Bug"
-    expect(page).to have_content internal_project.name
-    expect(page).to have_content "New internal feature"
-  end
-
-  step 'I visit "Community" merge requests page' do
-    visit project_merge_requests_path(public_project)
-  end
-
-  step 'project "Community" has "Bug fix" open merge request' do
-    create(:merge_request,
-      title: "Bug fix for public project",
-      source_project: public_project,
-      target_project: public_project
-          )
-  end
-
-  step 'I should see list of merge requests for "Community" project' do
-    expect(page).to have_content public_project.name
-    expect(page).to have_content public_merge_request.source_project.name
-  end
-
-  step 'I visit "Internal" merge requests page' do
-    visit project_merge_requests_path(internal_project)
-  end
-
-  step 'project "Internal" has "Feature implemented" open merge request' do
-    create(:merge_request,
-      title: "Feature implemented",
-      source_project: internal_project,
-      target_project: internal_project
-          )
-  end
-
-  step 'I should see list of merge requests for "Internal" project' do
-    expect(page).to have_content internal_project.name
-    expect(page).to have_content internal_merge_request.source_project.name
-  end
-
-  def internal_project
-    @internal_project ||= Project.find_by!(name: 'Internal')
-  end
-
-  def public_project
-    @public_project ||= Project.find_by!(name: 'Community')
-  end
-
-  def internal_merge_request
-    @internal_merge_request ||= MergeRequest.find_by!(title: 'Feature implemented')
-  end
-
-  def public_merge_request
-    @public_merge_request ||= MergeRequest.find_by!(title: 'Bug fix for public project')
-  end
-end
diff --git a/features/steps/profile/notifications.rb b/features/steps/profile/notifications.rb
index 7e339443b75..f8eb0f01de8 100644
--- a/features/steps/profile/notifications.rb
+++ b/features/steps/profile/notifications.rb
@@ -11,7 +11,7 @@ class Spinach::Features::ProfileNotifications < Spinach::FeatureSteps
   end
 
   step 'I select Mention setting from dropdown' do
-    first(:link, "On mention").trigger('click')
+    first(:link, "On mention").click
   end
 
   step 'I should see Notification saved message' do
diff --git a/features/steps/project/commits/branches.rb b/features/steps/project/commits/branches.rb
index ccaf3237815..c3ae33d2aa9 100644
--- a/features/steps/project/commits/branches.rb
+++ b/features/steps/project/commits/branches.rb
@@ -40,6 +40,7 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps
 
   step 'I submit new branch form with invalid name' do
     fill_in 'branch_name', with: '1.0 stable'
+    page.find("body").click # defocus the branch_name input
     select_branch('master')
     click_button 'Create branch'
   end
@@ -70,17 +71,16 @@ class Spinach::Features::ProjectCommitsBranches < Spinach::FeatureSteps
 
   step "I click branch 'improve/awesome' delete link" do
     page.within '.js-branch-improve\/awesome' do
-      find('.btn-remove').click
-      sleep 0.05
+      accept_alert { find('.btn-remove').click }
     end
   end
 
   step "I should not see branch 'improve/awesome'" do
-    expect(page.all(visible: true)).not_to have_content 'improve/awesome'
+    expect(page).to have_css('.js-branch-improve\\/awesome', visible: :hidden)
   end
 
   def select_branch(branch_name)
-    click_button 'master'
+    find('.git-revision-dropdown-toggle').click
 
     page.within '#new-branch-form .dropdown-menu' do
       click_link branch_name
diff --git a/features/steps/project/ff_merge_requests.rb b/features/steps/project/ff_merge_requests.rb
new file mode 100644
index 00000000000..d68fe71e16e
--- /dev/null
+++ b/features/steps/project/ff_merge_requests.rb
@@ -0,0 +1,65 @@
+class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedIssuable
+  include SharedProject
+  include SharedNote
+  include SharedPaths
+  include SharedMarkdown
+  include SharedDiffNote
+  include SharedUser
+  include WaitForRequests
+
+  step 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do
+    create(:merge_request_with_diffs,
+           title: "Bug NS-05",
+           source_project: project,
+           target_project: project,
+           author: project.users.first)
+  end
+
+  step 'I should see ff-only merge button' do
+    expect(page).to have_content "Fast-forward merge without a merge commit"
+    expect(page).to have_button 'Merge'
+  end
+
+  step 'merge request "Bug NS-05" is mergeable' do
+    merge_request.mark_as_mergeable
+  end
+
+  step 'I accept this merge request' do
+    page.within '.mr-state-widget' do
+      click_button "Merge"
+    end
+  end
+
+  step 'I should see merged request' do
+    page.within '.status-box' do
+      expect(page).to have_content "Merged"
+      wait_for_requests
+    end
+  end
+
+  step 'ff merge enabled' do
+    project = merge_request.target_project
+    project.merge_requests_ff_only_enabled = true
+    project.save!
+  end
+
+  step 'merge request "Bug NS-05" is rebased' do
+    merge_request.source_branch = 'flatten-dir'
+    merge_request.target_branch = 'improve/awesome'
+    merge_request.reload_diff
+    merge_request.save!
+  end
+
+  step 'merge request "Bug NS-05" merged target' do
+    merge_request.source_branch = 'merged-target'
+    merge_request.target_branch = 'improve/awesome'
+    merge_request.reload_diff
+    merge_request.save!
+  end
+
+  def merge_request
+    @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05")
+  end
+end
diff --git a/features/steps/project/fork.rb b/features/steps/project/fork.rb
index f88738b4c61..60707f26aee 100644
--- a/features/steps/project/fork.rb
+++ b/features/steps/project/fork.rb
@@ -26,7 +26,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
   end
 
   step 'I fork to my namespace' do
-    page.within '.fork-namespaces' do
+    page.within '.fork-thumbnail-container' do
       click_link current_user.name
     end
   end
@@ -58,13 +58,13 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
 
   step 'I should see my fork on the list' do
     page.within('.js-projects-list-holder') do
-      project = @user.fork_of(@project)
+      project = @user.fork_of(@project.reload)
       expect(page).to have_content("#{project.namespace.human_name} / #{project.name}")
     end
   end
 
   step 'I make forked repo invalid' do
-    project = @user.fork_of(@project)
+    project = @user.fork_of(@project.reload)
     project.path = 'test-crappy-path'
     project.save!
   end
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index 420ac8a695a..6781a906a94 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -5,6 +5,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   include SharedPaths
   include Select2Helper
   include WaitForRequests
+  include ProjectForksHelper
 
   step 'I am a member of project "Shop"' do
     @project = ::Project.find_by(name: "Shop")
@@ -13,7 +14,9 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I have a project forked off of "Shop" called "Forked Shop"' do
-    @forked_project = Projects::ForkService.new(@project, @user).execute
+    @forked_project = fork_project(@project, @user,
+                                   namespace: @user.namespace,
+                                   repository: true)
   end
 
   step 'I click link "New Merge Request"' do
diff --git a/features/steps/project/issues/filter_labels.rb b/features/steps/project/issues/filter_labels.rb
index d34fa694789..b467af53c98 100644
--- a/features/steps/project/issues/filter_labels.rb
+++ b/features/steps/project/issues/filter_labels.rb
@@ -28,12 +28,6 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps
     end
   end
 
-  step 'I click link "bug"' do
-    page.find('.js-label-select', visible: true).click
-    sleep 0.5
-    execute_script("$('.dropdown-menu-labels li:contains(\"bug\") a').click()")
-  end
-
   step 'I click "dropdown close button"' do
     page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click
     sleep 2
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index b9460f5b534..3843374678c 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -20,11 +20,13 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
   end
 
   step 'I should see that I am subscribed' do
-    expect(find('.issuable-subscribe-button span')).to have_content 'Unsubscribe'
+    wait_for_requests
+    expect(find('.js-issuable-subscribe-button span')).to have_content 'Unsubscribe'
   end
 
   step 'I should see that I am unsubscribed' do
-    expect(find('.issuable-subscribe-button span')).to have_content 'Subscribe'
+    wait_for_requests
+    expect(find('.js-issuable-subscribe-button span')).to have_content 'Subscribe'
   end
 
   step 'I click link "Closed"' do
@@ -223,7 +225,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
     end
   end
 
-  step 'The list should be sorted by "Most popular"' do
+  step 'The list should be sorted by "Popularity"' do
     page.within '.issues-list' do
       page.within 'li.issue:nth-child(1)' do
         expect(page).to have_content 'Release 0.4'
diff --git a/features/steps/project/issues/labels.rb b/features/steps/project/issues/labels.rb
index dac18c537ac..196e0fff63a 100644
--- a/features/steps/project/issues/labels.rb
+++ b/features/steps/project/issues/labels.rb
@@ -16,7 +16,7 @@ class Spinach::Features::ProjectIssuesLabels < Spinach::FeatureSteps
   step 'I delete all labels' do
     page.within '.labels' do
       page.all('.remove-row').each do
-        first('.remove-row').click
+        accept_confirm { first('.remove-row').click }
       end
     end
   end
diff --git a/features/steps/project/issues/milestones.rb b/features/steps/project/issues/milestones.rb
index 16a2d4a6f93..33a24e8913a 100644
--- a/features/steps/project/issues/milestones.rb
+++ b/features/steps/project/issues/milestones.rb
@@ -3,6 +3,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
   include SharedProject
   include SharedPaths
   include SharedMarkdown
+  include CapybaraHelpers
 
   step 'I should see milestone "v2.2"' do
     milestone = @project.milestones.find_by(title: "v2.2")
@@ -65,7 +66,7 @@ class Spinach::Features::ProjectIssuesMilestones < Spinach::FeatureSteps
   end
 
   step 'I click link to remove milestone' do
-    click_link 'Delete'
+    confirm_modal_if_present { click_link 'Delete' }
   end
 
   step 'I should see no milestones' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
deleted file mode 100644
index 0d49a4ab90d..00000000000
--- a/features/steps/project/merge_requests.rb
+++ /dev/null
@@ -1,632 +0,0 @@
-class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedIssuable
-  include SharedProject
-  include SharedNote
-  include SharedPaths
-  include SharedMarkdown
-  include SharedDiffNote
-  include SharedUser
-  include WaitForRequests
-
-  after do
-    wait_for_requests if javascript_test?
-  end
-
-  step 'I click link "New Merge Request"' do
-    page.within '.nav-controls' do
-      page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request')
-    end
-  end
-
-  step 'I click link "Bug NS-04"' do
-    click_link "Bug NS-04"
-  end
-
-  step 'I click link "Feature NS-05"' do
-    click_link "Feature NS-05"
-  end
-
-  step 'I click link "All"' do
-    find('.issues-state-filters [data-state="all"] span', text: 'All').click
-    # Waits for load
-    expect(find('.issues-state-filters > .active')).to have_content 'All'
-  end
-
-  step 'I click link "Merged"' do
-    find('#state-merged').trigger('click')
-  end
-
-  step 'I click link "Closed"' do
-    find('.issues-state-filters [data-state="closed"] span', text: 'Closed').click
-  end
-
-  step 'I should see merge request "Wiki Feature"' do
-    page.within '.merge-request' do
-      expect(page).to have_content "Wiki Feature"
-    end
-    wait_for_requests
-  end
-
-  step 'I should see closed merge request "Bug NS-04"' do
-    expect(page).to have_content "Bug NS-04"
-    expect(page).to have_content "Closed by"
-    wait_for_requests
-  end
-
-  step 'I should see merge request "Bug NS-04"' do
-    expect(page).to have_content "Bug NS-04"
-    wait_for_requests
-  end
-
-  step 'I should see merge request "Feature NS-05"' do
-    expect(page).to have_content "Feature NS-05"
-    wait_for_requests
-  end
-
-  step 'I should not see "master" branch' do
-    expect(find('.issuable-info')).not_to have_content "master"
-  end
-
-  step 'I should see "feature_conflict" branch' do
-    expect(page).to have_content "feature_conflict"
-  end
-
-  step 'I should see "Bug NS-04" in merge requests' do
-    expect(page).to have_content "Bug NS-04"
-  end
-
-  step 'I should see "Feature NS-03" in merge requests' do
-    expect(page).to have_content "Feature NS-03"
-  end
-
-  step 'I should not see "Feature NS-03" in merge requests' do
-    expect(page).not_to have_content "Feature NS-03"
-  end
-
-  step 'I should not see "Bug NS-04" in merge requests' do
-    expect(page).not_to have_content "Bug NS-04"
-  end
-
-  step 'I should see that I am subscribed' do
-    expect(find('.issuable-subscribe-button span')).to have_content 'Unsubscribe'
-  end
-
-  step 'I should see that I am unsubscribed' do
-    expect(find('.issuable-subscribe-button span')).to have_content 'Subscribe'
-  end
-
-  step 'I click button "Unsubscribe"' do
-    click_on "Unsubscribe"
-    wait_for_requests
-  end
-
-  step 'I click link "Close"' do
-    first(:css, '.close-mr-link').click
-  end
-
-  step 'I submit new merge request "Wiki Feature"' do
-    find('.js-source-branch').click
-    find('.dropdown-source-branch .dropdown-content a', text: 'fix').click
-
-    find('.js-target-branch').click
-    first('.dropdown-target-branch .dropdown-content a', text: 'feature').click
-
-    click_button "Compare branches"
-    fill_in "merge_request_title", with: "Wiki Feature"
-    click_button "Submit merge request"
-  end
-
-  step 'project "Shop" have "Bug NS-04" open merge request' do
-    create(:merge_request,
-           title: "Bug NS-04",
-           source_project: project,
-           target_project: project,
-           source_branch: 'fix',
-           target_branch: 'merge-test',
-           author: project.users.first,
-           description: "# Description header"
-          )
-  end
-
-  step 'project "Shop" have "Bug NS-06" open merge request' do
-    create(:merge_request,
-           title: "Bug NS-06",
-           source_project: project,
-           target_project: project,
-           source_branch: 'fix',
-           target_branch: 'feature_conflict',
-           author: project.users.first,
-           description: "# Description header"
-          )
-  end
-
-  step 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do
-    create(:merge_request_with_diffs,
-           title: "Bug NS-05",
-           source_project: project,
-           target_project: project,
-           author: project.users.first,
-           source_branch: 'merge-test')
-  end
-
-  step 'project "Shop" have "Feature NS-05" merged merge request' do
-    create(:merged_merge_request,
-           title: "Feature NS-05",
-           source_project: project,
-           target_project: project,
-           author: project.users.first)
-  end
-
-  step 'project "Shop" have "Bug NS-07" open merge request with rebased branch' do
-    create(:merge_request, :rebased,
-      title: "Bug NS-07",
-      source_project: project,
-      target_project: project,
-      author: project.users.first)
-  end
-
-  step 'project "Shop" have "Bug NS-08" open merge request with diverged branch' do
-    create(:merge_request, :diverged,
-      title: "Bug NS-08",
-      source_project: project,
-      target_project: project,
-      author: project.users.first)
-  end
-
-  step 'project "Shop" have "Feature NS-03" closed merge request' do
-    create(:closed_merge_request,
-           title: "Feature NS-03",
-           source_project: project,
-           target_project: project,
-           author: project.users.first)
-  end
-
-  step 'project "Community" has "Bug CO-01" open merge request with diffs inside' do
-    project = Project.find_by(name: "Community")
-    create(:merge_request_with_diffs,
-           title: "Bug CO-01",
-           source_project: project,
-           target_project: project,
-           author: project.users.first)
-  end
-
-  step 'merge request "Bug NS-04" have 2 upvotes and 1 downvote' do
-    merge_request = MergeRequest.find_by(title: 'Bug NS-04')
-    create_list(:award_emoji, 2, awardable: merge_request)
-    create(:award_emoji, :downvote, awardable: merge_request)
-  end
-
-  step 'merge request "Bug NS-06" have 1 upvote and 2 downvotes' do
-    awardable = MergeRequest.find_by(title: 'Bug NS-06')
-    create(:award_emoji, awardable: awardable)
-    create_list(:award_emoji, 2, :downvote, awardable: awardable)
-  end
-
-  step 'The list should be sorted by "Least popular"' do
-    page.within '.mr-list' do
-      page.within 'li.merge-request:nth-child(1)' do
-        expect(page).to have_content 'Bug NS-06'
-        expect(page).to have_content '1 2'
-      end
-
-      page.within 'li.merge-request:nth-child(2)' do
-        expect(page).to have_content 'Bug NS-04'
-        expect(page).to have_content '2 1'
-      end
-
-      page.within 'li.merge-request:nth-child(3)' do
-        expect(page).to have_content 'Bug NS-05'
-        expect(page).not_to have_content '0 0'
-      end
-    end
-  end
-
-  step 'The list should be sorted by "Most popular"' do
-    page.within '.mr-list' do
-      page.within 'li.merge-request:nth-child(1)' do
-        expect(page).to have_content 'Bug NS-04'
-        expect(page).to have_content '2 1'
-      end
-
-      page.within 'li.merge-request:nth-child(2)' do
-        expect(page).to have_content 'Bug NS-06'
-        expect(page).to have_content '1 2'
-      end
-
-      page.within 'li.merge-request:nth-child(3)' do
-        expect(page).to have_content 'Bug NS-05'
-        expect(page).not_to have_content '0 0'
-      end
-    end
-  end
-
-  step 'I click on the Changes tab' do
-    page.within '.merge-request-tabs' do
-      click_link 'Changes'
-    end
-
-    # Waits for load
-    expect(page).to have_css('.tab-content #diffs.active')
-  end
-
-  step 'I should see the proper Inline and Side-by-side links' do
-    expect(page).to have_css('#parallel-diff-btn', count: 1)
-    expect(page).to have_css('#inline-diff-btn', count: 1)
-  end
-
-  step 'I switch to the merge request\'s comments tab' do
-    visit project_merge_request_path(project, merge_request)
-  end
-
-  step 'I click on the commit in the merge request' do
-    page.within '.merge-request-tabs' do
-      click_link 'Commits'
-    end
-
-    page.within '.commits' do
-      click_link Commit.truncate_sha(sample_commit.id)
-    end
-  end
-
-  step 'I leave a comment on the diff page' do
-    init_diff_note
-    leave_comment "One comment to rule them all"
-  end
-
-  step 'I leave a comment on the diff page in commit' do
-    click_diff_line(sample_commit.line_code)
-    leave_comment "One comment to rule them all"
-  end
-
-  step 'I leave a comment like "Line is wrong" on diff' do
-    init_diff_note
-    leave_comment "Line is wrong"
-  end
-
-  step 'user "John Doe" leaves a comment like "Line is wrong" on diff' do
-    mr = MergeRequest.find_by(title: "Bug NS-05")
-    create(:diff_note_on_merge_request, project: project,
-                                        noteable: mr,
-                                        author: user_exists("John Doe"),
-                                        note: 'Line is wrong')
-  end
-
-  step 'I leave a comment like "Line is wrong" on diff in commit' do
-    click_diff_line(sample_commit.line_code)
-    leave_comment "Line is wrong"
-  end
-
-  step 'I change the comment "Line is wrong" to "Typo, please fix" on diff' do
-    page.within('.diff-file:nth-of-type(5) .note') do
-      find('.js-note-edit').click
-
-      page.within('.current-note-edit-form', visible: true) do
-        fill_in 'note_note', with: 'Typo, please fix'
-        click_button 'Save comment'
-      end
-
-      expect(page).not_to have_button 'Save comment', disabled: true, visible: true
-    end
-  end
-
-  step 'I should not see a diff comment saying "Line is wrong"' do
-    page.within('.diff-file:nth-of-type(5) .note') do
-      expect(page).not_to have_visible_content 'Line is wrong'
-    end
-  end
-
-  step 'I should see a diff comment saying "Typo, please fix"' do
-    page.within('.diff-file:nth-of-type(5) .note') do
-      expect(page).to have_visible_content 'Typo, please fix'
-    end
-  end
-
-  step 'I delete the comment "Line is wrong" on diff' do
-    page.within('.diff-file:nth-of-type(5) .note') do
-      find('.more-actions').click
-      find('.more-actions .dropdown-menu li', match: :first)
-
-      find('.js-note-delete').click
-    end
-  end
-
-  step 'I click on the Discussion tab' do
-    page.within '.merge-request-tabs' do
-      find('.notes-tab').trigger('click')
-    end
-
-    # Waits for load
-    expect(page).to have_css('.tab-content #notes.active')
-  end
-
-  step 'I should not see any discussion' do
-    expect(page).not_to have_css('.notes .discussion')
-  end
-
-  step 'I should see a discussion has started on diff' do
-    page.within(".notes .discussion") do
-      page.should have_content "#{current_user.name} #{current_user.to_reference} started a discussion"
-      page.should have_content sample_commit.line_code_path
-      page.should have_content "Line is wrong"
-    end
-  end
-
-  step 'I should see a discussion by user "John Doe" has started on diff' do
-    # Trigger a refresh of notes
-    execute_script("$(document).trigger('visibilitychange');")
-    wait_for_requests
-    page.within(".notes .discussion") do
-      page.should have_content "#{user_exists("John Doe").name} #{user_exists("John Doe").to_reference} started a discussion"
-      page.should have_content sample_commit.line_code_path
-      page.should have_content "Line is wrong"
-    end
-  end
-
-  step 'I should see a badge of "1" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("1")
-    wait_for_requests
-  end
-
-  step 'I should see a badge of "0" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("0")
-    wait_for_requests
-  end
-
-  step 'I should see a discussion has started on commit diff' do
-    page.within(".notes .discussion") do
-      page.should have_content "#{current_user.name} #{current_user.to_reference} started a discussion on commit"
-      page.should have_content sample_commit.line_code_path
-      page.should have_content "Line is wrong"
-      wait_for_requests
-    end
-  end
-
-  step 'I should see a discussion has started on commit' do
-    page.within(".notes .discussion") do
-      page.should have_content "#{current_user.name} #{current_user.to_reference} started a discussion on commit"
-      page.should have_content "One comment to rule them all"
-      wait_for_requests
-    end
-  end
-
-  step 'merge request is mergeable' do
-    expect(page).to have_button 'Merge'
-  end
-
-  step 'I modify merge commit message' do
-    click_button "Modify commit message"
-    fill_in 'Commit message', with: 'wow such merge'
-  end
-
-  step 'merge request "Bug NS-05" is mergeable' do
-    merge_request.mark_as_mergeable
-  end
-
-  step 'I accept this merge request' do
-    page.within '.mr-state-widget' do
-      click_button "Merge"
-    end
-  end
-
-  step 'I should see merged request' do
-    page.within '.status-box' do
-      expect(page).to have_content "Merged"
-      wait_for_requests
-    end
-  end
-
-  step 'I click link "Reopen"' do
-    first(:css, '.reopen-mr-link').trigger('click')
-  end
-
-  step 'I should see reopened merge request "Bug NS-04"' do
-    page.within '.status-box' do
-      expect(page).to have_content "Open"
-    end
-    wait_for_requests
-  end
-
-  step 'I click link "Hide inline discussion" of the third file' do
-    page.within '.files>div:nth-child(3)' do
-      find('.js-toggle-diff-comments').trigger('click')
-    end
-  end
-
-  step 'I click link "Show inline discussion" of the third file' do
-    page.within '.files>div:nth-child(3)' do
-      find('.js-toggle-diff-comments').trigger('click')
-    end
-  end
-
-  step 'I should not see a comment like "Line is wrong" in the third file' do
-    page.within '.files>div:nth-child(3)' do
-      expect(page).not_to have_visible_content "Line is wrong"
-    end
-  end
-
-  step 'I should see a comment like "Line is wrong" in the third file' do
-    page.within '.files>div:nth-child(3) .note-body > .note-text' do
-      expect(page).to have_visible_content "Line is wrong"
-      wait_for_requests
-    end
-  end
-
-  step 'I should not see a comment like "Line is wrong here" in the third file' do
-    page.within '.files>div:nth-child(3)' do
-      expect(page).not_to have_visible_content "Line is wrong here"
-    end
-  end
-
-  step 'I should see a comment like "Line is wrong here" in the third file' do
-    page.within '.files>div:nth-child(3) .note-body > .note-text' do
-      expect(page).to have_visible_content "Line is wrong here"
-    end
-  end
-
-  step 'I leave a comment like "Line is correct" on line 12 of the second file' do
-    init_diff_note_first_file
-
-    page.within(".js-discussion-note-form") do
-      fill_in "note_note", with: "Line is correct"
-      click_button "Comment"
-    end
-
-    wait_for_requests
-
-    page.within ".files>div:nth-child(2) .note-body > .note-text" do
-      expect(page).to have_content "Line is correct"
-    end
-  end
-
-  step 'I leave a comment like "Line is wrong" on line 39 of the third file' do
-    init_diff_note_second_file
-
-    page.within(".js-discussion-note-form") do
-      fill_in "note_note", with: "Line is wrong on here"
-      click_button "Comment"
-    end
-
-    wait_for_requests
-  end
-
-  step 'I should still see a comment like "Line is correct" in the second file' do
-    page.within '.files>div:nth-child(2) .note-body > .note-text' do
-      expect(page).to have_visible_content "Line is correct"
-    end
-  end
-
-  step 'I unfold diff' do
-    expect(page).to have_css('.js-unfold')
-
-    first('.js-unfold').click
-  end
-
-  step 'I should see additional file lines' do
-    expect(first('.text-file')).to have_content('.bundle')
-  end
-
-  step 'I click Side-by-side Diff tab' do
-    find('a', text: 'Side-by-side').trigger('click')
-
-    # Waits for load
-    expect(page).to have_css('.parallel')
-  end
-
-  step 'I should see comments on the side-by-side diff page' do
-    page.within '.files>div:nth-child(2) .parallel .note-body > .note-text' do
-      expect(page).to have_visible_content "Line is correct"
-      wait_for_requests
-    end
-  end
-
-  step 'I fill in merge request search with "Fe"' do
-    fill_in 'issuable_search', with: "Fe"
-    page.within '.merge-requests-holder' do
-      find('.merge-request')
-    end
-  end
-
-  step 'I click the "Target branch" dropdown' do
-    expect(page).to have_content('Target branch')
-    first('.target_branch').click
-  end
-
-  step 'I select a new target branch' do
-    select "feature", from: "merge_request_target_branch"
-    click_button 'Save'
-  end
-
-  step 'I should see new target branch changes' do
-    expect(page).to have_content 'Request to merge fix into feature'
-    expect(page).to have_content 'changed target branch from merge-test to feature'
-    wait_for_requests
-  end
-
-  step 'I click on "Email Patches"' do
-    click_link "Email Patches"
-  end
-
-  step 'I click on "Plain Diff"' do
-    click_link "Plain Diff"
-  end
-
-  step 'I should see a patch diff' do
-    expect(page).to have_content('diff --git')
-  end
-
-  step '"Bug NS-05" has CI status' do
-    project = merge_request.source_project
-    project.enable_ci
-
-    pipeline =
-      create(:ci_pipeline,
-             project: project,
-             sha: merge_request.diff_head_sha,
-             ref: merge_request.source_branch,
-             head_pipeline_of: merge_request)
-
-    create :ci_build, pipeline: pipeline
-  end
-
-  step 'I should see merge request "Bug NS-05" with CI status' do
-    page.within ".mr-list" do
-      expect(page).to have_link "Pipeline: pending"
-    end
-  end
-
-  step 'I should see the diverged commits count' do
-    page.within ".mr-source-target" do
-      expect(page).to have_content /([0-9]+ commits behind)/
-    end
-
-    wait_for_requests
-  end
-
-  step 'I should not see the diverged commits count' do
-    page.within ".mr-source-target" do
-      expect(page).not_to have_content /([0-9]+ commit[s]? behind)/
-    end
-
-    wait_for_requests
-  end
-
-  def merge_request
-    @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05")
-  end
-
-  def init_diff_note
-    click_diff_line(sample_commit.line_code)
-  end
-
-  def leave_comment(message)
-    page.within(".js-discussion-note-form", visible: true) do
-      fill_in "note_note", with: message
-      click_button "Comment"
-    end
-
-    wait_for_requests
-
-    page.within(".notes_holder", visible: true) do
-      expect(page).to have_content message
-    end
-  end
-
-  def init_diff_note_first_file
-    click_diff_line(sample_compare.changes[0][:line_code])
-  end
-
-  def init_diff_note_second_file
-    click_diff_line(sample_compare.changes[1][:line_code])
-  end
-
-  def have_visible_content(text)
-    have_css("*", text: text, visible: true)
-  end
-
-  def expect_discussion_badge_to_have_counter(value)
-    page.within(".notes-tab .badge") do
-      page.should have_content value
-    end
-  end
-end
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index 621cae5d80d..6e04f09f322 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -46,10 +46,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
     expect(page).to have_content new_gitignore_content
   end
 
-  step 'I should see its content with new lines preserved at end of file' do
-    expect(evaluate_script('ace.edit("editor").getValue()')).to eq "Sample\n\n\n"
-  end
-
   step 'I click link "Raw"' do
     click_link 'Open raw'
   end
@@ -70,20 +66,11 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
     click_link 'Fork'
   end
 
-  step 'I can edit code' do
-    set_new_content
-    expect(evaluate_script('ace.edit("editor").getValue()')).to eq new_gitignore_content
-  end
-
   step 'I edit code' do
     expect(page).to have_selector('.file-editor')
     set_new_content
   end
 
-  step 'I edit code with new lines at end of file' do
-    execute_script('ace.edit("editor").setValue("Sample\n\n\n")')
-  end
-
   step 'I fill the new file name' do
     fill_in :file_name, with: new_file_name
   end
@@ -395,6 +382,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
   private
 
   def set_new_content
+    find('#editor')
     execute_script("ace.edit('editor').setValue('#{new_gitignore_content}')")
   end
 
diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 2c59ec5bb06..aa32528a7ca 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -215,7 +215,7 @@ module SharedDiffNote
   end
 
   step 'I click side-by-side diff button' do
-    find('#parallel-diff-btn').trigger('click')
+    find('#parallel-diff-btn').click
   end
 
   step 'I see side-by-side diff button' do
@@ -227,12 +227,11 @@ module SharedDiffNote
   end
 
   def click_diff_line(code)
-    find(".line_holder[id='#{code}'] td:nth-of-type(1)").trigger 'mouseover'
-    find(".line_holder[id='#{code}'] button").trigger 'click'
+    find(".line_holder[id='#{code}'] button").click
   end
 
   def click_parallel_diff_line(code, line_type)
-    find(".line_holder.parallel .diff-line-num[id='#{code}']").trigger 'mouseover'
-    find(".line_holder.parallel button[data-line-code='#{code}']").trigger 'click'
+    find(".line_holder.parallel td[id='#{code}']").find(:xpath, 'preceding-sibling::*[1][self::td]').hover
+    find(".line_holder.parallel button[data-line-code='#{code}']").click
   end
 end
diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb
index 7c842ba88fb..714985f2051 100644
--- a/features/steps/shared/issuable.rb
+++ b/features/steps/shared/issuable.rb
@@ -109,10 +109,10 @@ module SharedIssuable
     edit_issuable
   end
 
-  step 'I sort the list by "Oldest updated"' do
+  step 'I sort the list by "Last updated"' do
     find('button.dropdown-toggle').click
     page.within('.content ul.dropdown-menu.dropdown-menu-align-right li') do
-      click_link "Oldest updated"
+      click_link "Last updated"
     end
   end
 
@@ -124,16 +124,16 @@ module SharedIssuable
     end
   end
 
-  step 'I sort the list by "Most popular"' do
+  step 'I sort the list by "Popularity"' do
     find('button.dropdown-toggle').click
 
     page.within('.content ul.dropdown-menu.dropdown-menu-align-right li') do
-      click_link 'Most popular'
+      click_link 'Popularity'
     end
   end
 
-  step 'The list should be sorted by "Oldest updated"' do
-    expect(find('.issues-filters')).to have_content('Oldest updated')
+  step 'The list should be sorted by "Last updated"' do
+    expect(find('.issues-filters')).to have_content('Last updated')
   end
 
   step 'I click link "Next" in the sidebar' do
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index 0cd7b506a95..95f0cd2156e 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -14,7 +14,7 @@ module SharedNote
       find('.more-actions').click
       find('.more-actions .dropdown-menu li', match: :first)
 
-      find(".js-note-delete").click
+      accept_confirm { find(".js-note-delete").click }
     end
   end
 
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index be69a96c3ee..bff0d58aaf4 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -222,7 +222,7 @@ module SharedPaths
   end
 
   step "I visit my project's commits page for a specific path" do
-    visit project_commits_path(@project, root_ref + "/app/models/project.rb", { limit: 5 })
+    visit project_commits_path(@project, root_ref + "/files/ruby/regex.rb", { limit: 5 })
   end
 
   step 'I visit my project\'s commits stats page' do
@@ -454,19 +454,6 @@ module SharedPaths
   # ----------------------------------------
   # Public Projects
   # ----------------------------------------
-
-  step 'I visit the public projects area' do
-    visit explore_projects_path
-  end
-
-  step 'I visit the explore trending projects' do
-    visit trending_explore_projects_path
-  end
-
-  step 'I visit the explore starred projects' do
-    visit starred_explore_projects_path
-  end
-
   step 'I visit the public groups area' do
     visit explore_groups_path
   end
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 96cc0745e97..5e4edaf99a6 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -112,10 +112,6 @@ module SharedProject
   # Visibility of archived project
   # ----------------------------------------
 
-  step 'archived project "Archive"' do
-    create(:project, :archived, :public, :repository, name: 'Archive')
-  end
-
   step 'I should not see project "Archive"' do
     project = Project.find_by(name: "Archive")
     expect(page).not_to have_content project.name_with_namespace
@@ -126,11 +122,6 @@ module SharedProject
     expect(page).to have_content project.name_with_namespace
   end
 
-  step 'project "Archive" has comments' do
-    project = Project.find_by(name: "Archive")
-    2.times { create(:note_on_issue, project: project) }
-  end
-
   # ----------------------------------------
   # Visibility level
   # ----------------------------------------
@@ -209,15 +200,6 @@ module SharedProject
     create :project_empty_repo, :public, name: "Empty Public Project"
   end
 
-  step 'project "Community" has comments' do
-    project = Project.find_by(name: "Community")
-    2.times { create(:note_on_issue, project: project) }
-  end
-
-  step 'trending projects are refreshed' do
-    TrendingProject.refresh!
-  end
-
   step 'project "Shop" has labels: "bug", "feature", "enhancement"' do
     project = Project.find_by(name: "Shop")
     create(:label, project: project, title: 'bug')
diff --git a/features/support/capybara.rb b/features/support/capybara.rb
index f4691647d4b..3c4db8b9601 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -1,22 +1,21 @@
-require 'capybara/poltergeist'
 require 'capybara-screenshot/spinach'
 
 # Give CI some extra time
 timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 60 : 30
 
-Capybara.javascript_driver = :poltergeist
-Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(
-    app,
-    js_errors: true,
-    timeout: timeout,
-    window_size: [1366, 768],
-    url_whitelist: %w[localhost 127.0.0.1],
-    url_blacklist: %w[.mp4 .png .gif .avi .bmp .jpg .jpeg],
-    phantomjs_options: [
-      '--load-images=yes'
-    ]
+Capybara.javascript_driver = :chrome
+Capybara.register_driver :chrome do |app|
+  extra_args = []
+  extra_args << 'headless' unless ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i
+
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+    chromeOptions: {
+      'args' => %w[no-sandbox disable-gpu --window-size=1240,1400] + extra_args
+    }
   )
+
+  Capybara::Selenium::Driver
+    .new(app, browser: :chrome, desired_capabilities: capabilities)
 end
 
 Capybara.default_max_wait_time = timeout
@@ -24,6 +23,10 @@ Capybara.ignore_hidden_elements = false
 
 # Keep only the screenshots generated from the last failing test suite
 Capybara::Screenshot.prune_strategy = :keep_last_run
+# From https://github.com/mattheworiordan/capybara-screenshot/issues/84#issuecomment-41219326
+Capybara::Screenshot.register_driver(:chrome) do |driver, path|
+  driver.browser.save_screenshot(path)
+end
 
 Spinach.hooks.before_run do
   TestEnv.eager_load_driver_server
diff --git a/features/support/capybara_helpers.rb b/features/support/capybara_helpers.rb
new file mode 100644
index 00000000000..647f8d087c3
--- /dev/null
+++ b/features/support/capybara_helpers.rb
@@ -0,0 +1,10 @@
+module CapybaraHelpers
+  def confirm_modal_if_present
+    if Capybara.current_driver == Capybara.javascript_driver
+      accept_confirm { yield }
+      return
+    end
+
+    yield
+  end
+end
diff --git a/features/support/env.rb b/features/support/env.rb
index d99078d4fa3..b93ddecdced 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -10,7 +10,7 @@ if ENV['CI']
   Knapsack::Adapters::SpinachAdapter.bind
 end
 
-%w(select2_helper test_env repo_helpers wait_for_requests sidekiq).each do |f|
+%w(select2_helper test_env repo_helpers wait_for_requests sidekiq project_forks_helper).each do |f|
   require Rails.root.join('spec', 'support', f)
 end