Commit b7144637 authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflict in config/routes/group.rb

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 39fb90d0
...@@ -42,7 +42,6 @@ constraints(GroupUrlConstrainer.new) do ...@@ -42,7 +42,6 @@ constraints(GroupUrlConstrainer.new) do
## EE-specific ## EE-specific
end end
<<<<<<< HEAD
resource :avatar, only: [:destroy] resource :avatar, only: [:destroy]
resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
member do member do
...@@ -76,33 +75,17 @@ constraints(GroupUrlConstrainer.new) do ...@@ -76,33 +75,17 @@ constraints(GroupUrlConstrainer.new) do
end end
resources :variables, only: [:index, :show, :update, :create, :destroy] resources :variables, only: [:index, :show, :update, :create, :destroy]
resources :billings, only: [:index]
resources :children, only: [:index]
## EE-specific ## EE-specific
resources :billings, only: [:index]
resources :boards, only: [:index, :show, :create, :update, :destroy] resources :boards, only: [:index, :show, :create, :update, :destroy]
end end
## EE-specific ## EE-specific
get :boards, to: redirect('/groups/%{group_id}/-/boards') get :boards, to: redirect('/groups/%{group_id}/-/boards')
end end
=======
resources :variables, only: [:index, :show, :update, :create, :destroy]
resources :children, only: [:index]
end
end
scope(path: 'groups/*id',
controller: :groups,
constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }) do
get :edit, as: :edit_group
get :issues, as: :issues_group
get :merge_requests, as: :merge_requests_group
get :projects, as: :projects_group
get :activity, as: :activity_group
get '/', action: :show, as: :group_canonical
end
>>>>>>> upstream/master
scope(path: '*id', scope(path: '*id',
as: :group, as: :group,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment