diff options
author | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-06 16:15:59 +0200 |
---|---|---|
committer | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-06 16:15:59 +0200 |
commit | 92bbcf9079270897d419a0b4c196ac17251bf68a (patch) | |
tree | 357cdf26cf811aaddc98ccebaedb02d9575ac74b /config/routes | |
parent | d92b7f7ca738958add587188b4e415e4bf8fb394 (diff) | |
parent | bac9a1dde1e75d057e212ab5d3b9b478d3981e1d (diff) | |
download | gitlab-ce-92bbcf9079270897d419a0b4c196ac17251bf68a.tar.gz |
merge master and resolve conflicts
Diffstat (limited to 'config/routes')
-rw-r--r-- | config/routes/group.rb | 1 | ||||
-rw-r--r-- | config/routes/project.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index d7313e43786..343865cc50c 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -25,7 +25,6 @@ constraints(::Constraints::GroupUrlConstrainer.new) do constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do namespace :settings do resource :ci_cd, only: [:show], controller: 'ci_cd' - resources :badges, only: [:index] end resource :variables, only: [:show, :update] diff --git a/config/routes/project.rb b/config/routes/project.rb index 34f49546983..4021d62b931 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -442,7 +442,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :repository, only: [:show], controller: :repository do post :create_deploy_token, path: 'deploy_token/create' end - resources :badges, only: [:index] end # Since both wiki and repository routing contains wildcard characters |