diff options
| author | Raffael Schmid <raf@nine.ch> | 2014-01-23 10:55:26 +0100 |
|---|---|---|
| committer | Raffael Schmid <raf@nine.ch> | 2014-01-23 10:55:26 +0100 |
| commit | 7863319b97498a7621815cfe5691794ecb86b8c5 (patch) | |
| tree | 5ae991fe7543bcb91e9257242e87849538b33214 /features/project/merge_requests.feature | |
| parent | 568d1c27c5a1b4d6749943240cdba2625eee2b6e (diff) | |
| parent | 68590fddd860c5d840d8f04314ed11f0d02ddd44 (diff) | |
| download | gitlab-ce-7863319b97498a7621815cfe5691794ecb86b8c5.tar.gz | |
Merge branch 'master' into dont-depend-on-appid-and-appsecret
* master: (238 commits)
Version 6.5.1
Fix selectbox when submit MR from fork to origin
Fix HELP layout
No need for code tag here.
Spelling mistake and add links.
Warn against RVM.
Remove GitHub mention because we also have a GitLab issue tracker now.
Replace 6.0-to-6.4.md with 6.0-to-6.5.md
Add public assets to gitignore
Version 6.5.0
Use 6-5 branch in installation docs
Remove deprecated twitter handle.
Further explain userPrincipalName settings
Update from 6.4 to 6.5 guide
Explain how to use AD userPrincipalName for logins
More entries to CHANGELOG. Version to rc1
Rephrase LDAP check script output
add O'Reilly sponsorship in CHANGELOG
Fix select2 css for drop above style
Rename "Website url" labels to "Website"
...
Diffstat (limited to 'features/project/merge_requests.feature')
| -rw-r--r-- | features/project/merge_requests.feature | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 63f27c3acc3..4e4ac1a68e4 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -67,3 +67,13 @@ Feature: Project Merge Requests And I leave a comment on the diff page And I switch to the merge request's comments tab Then I should see a discussion has started on commit bcf03b5de6c + + @javascript + Scenario: I accept merge request with custom commit message + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And merge request "Bug NS-05" is mergeable + And I visit merge request page "Bug NS-05" + And merge request is mergeable + Then I modify merge commit message + And I accept this merge request + Then I should see merged request |