diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 13:34:25 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 13:34:25 +0300 |
| commit | 4ebe718d69bc4a619f829ab54a81a6ed03cd56c1 (patch) | |
| tree | 74e851919e1ffe9a8b4368c3e48d7d08a6ccf73b /features | |
| parent | 0cc30145f441a16ce513bba942ea67ede4086a7f (diff) | |
| parent | 3098e7a453c84ac4df1686b8bad6ef8004aca60d (diff) | |
| download | gitlab-ce-4ebe718d69bc4a619f829ab54a81a6ed03cd56c1.tar.gz | |
Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/blob/_remove.html.haml
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 0cc78f0f58d..c101c696253 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -154,7 +154,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I modify merge commit message' do find('.modify-merge-commit-link').click - fill_in 'merge_commit_message', with: "wow such merge" + fill_in 'commit_message', with: 'wow such merge' end step 'merge request "Bug NS-05" is mergeable' do |