summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-11 19:43:56 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-11 19:43:56 +0000
commite1a8089cc2a54126596abae50f2987e2421b1dc3 (patch)
tree15bc0e5a26f3c9ef746bbc969544fd7c04006bc0 /features
parent95a470cf5087abcd497ef3b260f443ae3ffebeef (diff)
parentaa4d19904418cf57369ab9c80d05730c03636baf (diff)
downloadgitlab-ce-e1a8089cc2a54126596abae50f2987e2421b1dc3.tar.gz
Merge branch 'create-merge-request' into 'master'
Add Create Merge Request buttons to commits page and push event. Commits page: ![Screen_Shot_2015-05-09_at_22.27.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f77c2e47f768b2fc132de6e3a2a0323e/Screen_Shot_2015-05-09_at_22.27.09.png) Branches page: ![Screen_Shot_2015-05-09_at_22.55.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0a6374f5c5d830ef19de9694e603c8f/Screen_Shot_2015-05-09_at_22.55.24.png) Push event: (Only for new branches, and only shown to the pushing user) ![Screen_Shot_2015-05-09_at_22.27.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/989c9cb66ee03d09b96809452749d2b8/Screen_Shot_2015-05-09_at_22.27.21.png) Push event with multiple commits and a Compare link: ![Screen_Shot_2015-05-09_at_22.28.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a70c718e559f69177f9341c0af92707c/Screen_Shot_2015-05-09_at_22.28.01.png) See merge request !632
Diffstat (limited to 'features')
-rw-r--r--features/steps/project/commits/commits.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index 30b1934b363..c888e82e207 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -12,7 +12,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
end
step 'I click atom feed link' do
- click_link "Feed"
+ click_link "Commits Feed"
end
step 'I see commits atom feed' do