diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-08 12:54:23 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-08 12:54:23 +0000 |
| commit | 11ff9fc6a9837cd5defa0325b5057a5a3d84634c (patch) | |
| tree | 0eb9d8123e50afd8ed4ddd0fef2c82d2cbf446fd /spec/support | |
| parent | 1d0aa4806fb3d7a793e7bc4eac50032a8e3c53d7 (diff) | |
| parent | 29519edb55f17d0e7de5dfb289085c894b4d2826 (diff) | |
| download | gitlab-ce-11ff9fc6a9837cd5defa0325b5057a5a3d84634c.tar.gz | |
Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' into 'master'
31977-ensure-all-webpack-bundles-which-include-vue-are-children-of-common_vue-js
Use regex to skip unnecessary reference processing in ProcessCommitWorker
Closes #28359
See merge request !10867
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/cycle_analytics_helpers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/cycle_analytics_helpers.rb b/spec/support/cycle_analytics_helpers.rb index 8ad042f5e3b..66545127a44 100644 --- a/spec/support/cycle_analytics_helpers.rb +++ b/spec/support/cycle_analytics_helpers.rb @@ -20,7 +20,7 @@ module CycleAnalyticsHelpers ref: 'refs/heads/master').execute end - def create_merge_request_closing_issue(issue, message: nil, source_branch: nil) + def create_merge_request_closing_issue(issue, message: nil, source_branch: nil, commit_message: 'commit message') if !source_branch || project.repository.commit(source_branch).blank? source_branch = generate(:branch) project.repository.add_branch(user, source_branch, 'master') @@ -30,7 +30,7 @@ module CycleAnalyticsHelpers user, generate(:branch), 'content', - message: 'commit message', + message: commit_message, branch_name: source_branch) project.repository.commit(sha) |