summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-11 17:49:06 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-11 17:49:06 +0000
commitcb6ad67f52c9e849e0f8ca34b2fff47c585bd816 (patch)
treedb0a79d9c02b2e9cfc4516fa87edc8281dc7adb9 /features
parenta0cd4f8fb4b67b080e30ac7975b7b840d9de286e (diff)
parent4a2b7cef5721a4524ae829e1227c7aa7e16a426a (diff)
downloadgitlab-ce-cb6ad67f52c9e849e0f8ca34b2fff47c585bd816.tar.gz
Merge branch 'check-out-branch-button' into 'master'
Add "Check out branch" button to the MR page. I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120. ![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png) It looks even better in combination with !1121, which gets rid of the "If you want to ..." line: ![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png) cc @dzaporozhets @rspeicher See merge request !1116
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/merge_requests.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index a1a26abd8ca..04784207a1a 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -326,7 +326,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I should see new target branch changes' do
- expect(page).to have_content 'From fix into feature'
+ expect(page).to have_content 'Request to merge fix into feature'
expect(page).to have_content 'Target branch changed from master to feature'
end