diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 14:02:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-18 14:02:45 +0000 |
| commit | 80f61b4035607d7cd87de993b8f5e996bde3481f (patch) | |
| tree | 06b12f51e97d87192e3dd0e05edf55143645b894 /app/controllers/projects/merge_requests/creations_controller.rb | |
| parent | 4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (diff) | |
| download | gitlab-ce-80f61b4035607d7cd87de993b8f5e996bde3481f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/merge_requests/creations_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests/creations_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 6ac5bb90706..808265634da 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -12,7 +12,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap before_action :build_merge_request, except: [:create] def new - # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/40934 + # n+1: https://gitlab.com/gitlab-org/gitlab-foss/issues/40934 Gitlab::GitalyClient.allow_n_plus_1_calls do define_new_vars end @@ -92,7 +92,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap def build_merge_request params[:merge_request] ||= ActionController::Parameters.new(source_project: @project) - # Gitaly N+1 issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/58096 + # Gitaly N+1 issue: https://gitlab.com/gitlab-org/gitlab-foss/issues/58096 Gitlab::GitalyClient.allow_n_plus_1_calls do @merge_request = ::MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute end @@ -135,7 +135,7 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap # rubocop: enable CodeReuse/ActiveRecord def whitelist_query_limiting - Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42384') + Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-foss/issues/42384') end def incr_count_webide_merge_request |