diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:07:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 12:07:43 +0000 |
| commit | 39fa7d1eeb2dba52f0601128f3ac91f57d19866e (patch) | |
| tree | da042d34ff762dd1957e51666a34202295a081b9 /app/services/merge_requests | |
| parent | 6ac4a6713ed3196af899011f7e18658e16ebaac0 (diff) | |
| download | gitlab-ce-39fa7d1eeb2dba52f0601128f3ac91f57d19866e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/after_create_service.rb | 7 | ||||
| -rw-r--r-- | app/services/merge_requests/create_service.rb | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/app/services/merge_requests/after_create_service.rb b/app/services/merge_requests/after_create_service.rb index 6da30f8af16..bc681397039 100644 --- a/app/services/merge_requests/after_create_service.rb +++ b/app/services/merge_requests/after_create_service.rb @@ -6,11 +6,8 @@ module MergeRequests event_service.open_mr(merge_request, current_user) notification_service.new_merge_request(merge_request, current_user) - # https://gitlab.com/gitlab-org/gitlab/issues/208813 - if ::Feature.enabled?(:create_merge_request_pipelines_in_sidekiq, project) - create_pipeline_for(merge_request, current_user) - merge_request.update_head_pipeline - end + create_pipeline_for(merge_request, current_user) + merge_request.update_head_pipeline merge_request.diffs(include_stats: false).write_cache merge_request.create_cross_references!(current_user) diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index d957a6425b2..1cdfba41432 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -21,12 +21,6 @@ module MergeRequests todo_service.new_merge_request(issuable, current_user) issuable.cache_merge_request_closes_issues!(current_user) - # https://gitlab.com/gitlab-org/gitlab/issues/208813 - unless ::Feature.enabled?(:create_merge_request_pipelines_in_sidekiq, project) - create_pipeline_for(issuable, current_user) - issuable.update_head_pipeline - end - Gitlab::UsageDataCounters::MergeRequestCounter.count(:create) link_lfs_objects(issuable) |