diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-28 15:09:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-28 15:09:17 +0000 |
| commit | 1bb7f81e238569fd0fe2b0c4385f1015407a2d59 (patch) | |
| tree | 768c7d44fa3ed641a7e26fdf9db61422902e8294 /config/routes | |
| parent | eb3a23aaaa99ef8ae08c7b440fad676e3c71a1af (diff) | |
| download | gitlab-ce-1bb7f81e238569fd0fe2b0c4385f1015407a2d59.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/jira_connect.rb | 1 | ||||
| -rw-r--r-- | config/routes/project.rb | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb index 202d2574ad0..f45f524935a 100644 --- a/config/routes/jira_connect.rb +++ b/config/routes/jira_connect.rb @@ -14,6 +14,7 @@ namespace :jira_connect do resources :subscriptions, only: [:index, :create, :destroy] resources :branches, only: [:new] + resources :public_keys, only: :show resources :installations, only: [:index] do collection do diff --git a/config/routes/project.rb b/config/routes/project.rb index db121794f57..cd9315ba2aa 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -223,11 +223,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - resources :boards, only: [:index, :show, :create, :update, :destroy], constraints: { id: /\d+/ } do - collection do - get :recent - end - end + resources :boards, only: [:index, :show], constraints: { id: /\d+/ } get 'releases/permalink/latest(/)(*suffix_path)', to: 'releases#latest_permalink', as: :latest_release_permalink, format: false |