summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorHan Loong Liauw <hanloongliauw@gmail.com>2015-10-14 19:46:27 +1100
committerHan Loong Liauw <hanloongliauw@gmail.com>2015-10-14 19:46:27 +1100
commite1d70c4f31936cd73ba25aeff573dedd27b11332 (patch)
tree2092b952a825ef20634e24f0d04458977b9cff0b /features
parentde026375fc4eea39ae4bccb2de3bbed93de8c86b (diff)
parent82da19cecd6390d2372bad36da0a9f89b21abb38 (diff)
downloadgitlab-ce-e1d70c4f31936cd73ba25aeff573dedd27b11332.tar.gz
Merge branch 'master' into add-dates-snippets-show
Also removed fixes to btn-sm as they have appears to be already merged into master
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 ae5f90004e6..a3cb83880e3 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -118,6 +118,6 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
step 'I see builds list' do
expect(page).to have_content "build: pending"
- expect(page).to have_content "Builds for master"
+ expect(page).to have_content "Latest builds"
end
end