diff options
| author | Luke Duncalfe <lduncalfe@gitlab.com> | 2019-02-06 12:33:11 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-06 12:33:11 +0000 |
| commit | 2b7dd017af7de4d09ef3a1cd835e8d07c8800b6a (patch) | |
| tree | 47615a573f6dc932353f0f6695cd4fcd050b1201 /spec/features/merge_requests/user_squashes_merge_request_spec.rb | |
| parent | 5bfa8e2f5e03849645570ba8c2dbfcc5c834f1b1 (diff) | |
| download | gitlab-ce-2b7dd017af7de4d09ef3a1cd835e8d07c8800b6a.tar.gz | |
Allow custom squash commit messages
Diffstat (limited to 'spec/features/merge_requests/user_squashes_merge_request_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/user_squashes_merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/user_squashes_merge_request_spec.rb b/spec/features/merge_requests/user_squashes_merge_request_spec.rb index 47f9f10815c..bf9c55cf22c 100644 --- a/spec/features/merge_requests/user_squashes_merge_request_spec.rb +++ b/spec/features/merge_requests/user_squashes_merge_request_spec.rb @@ -14,7 +14,7 @@ describe 'User squashes a merge request', :js do latest_master_commits = project.repository.commits_between(original_head.sha, 'master').map(&:raw) squash_commit = an_object_having_attributes(sha: a_string_matching(/\h{40}/), - message: "Csv\n", + message: a_string_starting_with(project.merge_requests.first.default_squash_commit_message), author_name: user.name, committer_name: user.name) |