diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 22:48:55 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 22:48:55 +0200 |
| commit | 69c193e78a14e34d1c67527df821886a38c2e5d8 (patch) | |
| tree | 21b14cfaebc7ece9ae2f489aa9880ca1655e3a08 /features | |
| parent | d25c56cfd8da9b94ba5744a9bd09c05070b25c64 (diff) | |
| parent | cb6ad67f52c9e849e0f8ca34b2fff47c585bd816 (diff) | |
| download | gitlab-ce-69c193e78a14e34d1c67527df821886a38c2e5d8.tar.gz | |
Merge branch 'master' into remove-satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index f2198f58c13..778dce06359 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -321,7 +321,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 |