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/requests | |
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/requests')
-rw-r--r-- | spec/requests/projects/cycle_analytics_events_spec.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/requests/projects/cycle_analytics_events_spec.rb b/spec/requests/projects/cycle_analytics_events_spec.rb index 33940f70b1c..c5a45949841 100644 --- a/spec/requests/projects/cycle_analytics_events_spec.rb +++ b/spec/requests/projects/cycle_analytics_events_spec.rb @@ -9,8 +9,6 @@ describe 'cycle analytics events', api: true do before do project.team << [user, :developer] - allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue]) - 3.times do |count| Timecop.freeze(Time.now + count.days) do create_cycle @@ -121,7 +119,7 @@ describe 'cycle analytics events', api: true do def create_cycle milestone = create(:milestone, project: project) issue.update(milestone: milestone) - mr = create_merge_request_closing_issue(issue) + mr = create_merge_request_closing_issue(issue, commit_message: "References #{issue.to_reference}") pipeline = create(:ci_empty_pipeline, status: 'created', project: project, ref: mr.source_branch, sha: mr.source_branch_sha) pipeline.run |