diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-03 15:50:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-03-03 15:50:03 +0000 |
| commit | df63d9db40e568bcca87cf7946cf518684538a31 (patch) | |
| tree | 923a9f6d5da46fa8091798b3ee2c2578f3295347 /spec/features | |
| parent | f9aae510d9d917eda1ad3970f7989fb7d4e74f2c (diff) | |
| parent | 358897bcbfa7e907511f29cf80acc315ade160b1 (diff) | |
| download | gitlab-ce-df63d9db40e568bcca87cf7946cf518684538a31.tar.gz | |
Merge branch 'dm-fix-cherry-pick' into 'master'
Fix cherry-picking or reverting through an MR
Closes #28711 and #28426
See merge request !9640
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/projects/commit/cherry_pick_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/features/projects/commit/cherry_pick_spec.rb b/spec/features/projects/commit/cherry_pick_spec.rb index 7baf7913424..0b972d2a439 100644 --- a/spec/features/projects/commit/cherry_pick_spec.rb +++ b/spec/features/projects/commit/cherry_pick_spec.rb @@ -60,6 +60,7 @@ describe 'Cherry-pick Commits' do click_button 'Cherry-pick' end expect(page).to have_content('The commit has been successfully cherry-picked. You can now submit a merge request to get this change into the original branch.') + expect(page).to have_content("From cherry-pick-#{master_pickable_commit.short_id} into master") end end |