diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
| commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
| tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /config/routes/merge_requests.rb | |
| parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) | |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'config/routes/merge_requests.rb')
| -rw-r--r-- | config/routes/merge_requests.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes/merge_requests.rb b/config/routes/merge_requests.rb index b0bab1717a6..29e0d65b58c 100644 --- a/config/routes/merge_requests.rb +++ b/config/routes/merge_requests.rb @@ -34,7 +34,7 @@ resources :merge_requests, concerns: :awardable, except: [:new, :create, :show], scope action: :show do get :commits, defaults: { tab: 'commits' } get :pipelines, defaults: { tab: 'pipelines' } - get :diffs, defaults: { tab: 'diffs' } + get :diffs, to: 'merge_requests#diffs', defaults: { tab: 'diffs' } end get :diff_for_path, controller: 'merge_requests/diffs' @@ -78,6 +78,7 @@ scope path: 'merge_requests', controller: 'merge_requests/creations' do scope constraints: ->(req) { req.format == :json }, as: :json do get :diffs get :pipelines + get :target_projects end scope action: :new do |