Merge branch 'backort_routes_group_routes_from_ee' into 'master'
Backport EE changes to group routes Closes gitlab-ee#3794 See merge request gitlab-org/gitlab-ce!14973
This commit is contained in:
commit
a441e7a74f
|
@ -4,51 +4,51 @@ resources :groups, only: [:index, :new, :create] do
|
|||
post :preview_markdown
|
||||
end
|
||||
|
||||
scope(path: 'groups/*group_id',
|
||||
module: :groups,
|
||||
as: :group,
|
||||
constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
|
||||
resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
|
||||
post :resend_invite, on: :member
|
||||
delete :leave, on: :collection
|
||||
end
|
||||
|
||||
resource :avatar, only: [:destroy]
|
||||
resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
|
||||
member do
|
||||
get :merge_requests
|
||||
get :participants
|
||||
get :labels
|
||||
end
|
||||
end
|
||||
|
||||
resources :labels, except: [:show] do
|
||||
post :toggle_subscription, on: :member
|
||||
end
|
||||
|
||||
scope path: '-' do
|
||||
namespace :settings do
|
||||
resource :ci_cd, only: [:show], controller: 'ci_cd'
|
||||
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
|
||||
|
||||
constraints(GroupUrlConstrainer.new) do
|
||||
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
|
||||
|
||||
scope(path: 'groups/*group_id',
|
||||
module: :groups,
|
||||
as: :group,
|
||||
constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
|
||||
resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
|
||||
post :resend_invite, on: :member
|
||||
delete :leave, on: :collection
|
||||
end
|
||||
|
||||
resource :avatar, only: [:destroy]
|
||||
resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
|
||||
member do
|
||||
get :merge_requests
|
||||
get :participants
|
||||
get :labels
|
||||
end
|
||||
end
|
||||
|
||||
resources :labels, except: [:show] do
|
||||
post :toggle_subscription, on: :member
|
||||
end
|
||||
|
||||
scope path: '-' do
|
||||
namespace :settings do
|
||||
resource :ci_cd, only: [:show], controller: 'ci_cd'
|
||||
end
|
||||
|
||||
resources :variables, only: [:index, :show, :update, :create, :destroy]
|
||||
|
||||
resources :children, only: [:index]
|
||||
end
|
||||
end
|
||||
|
||||
scope(path: '*id',
|
||||
as: :group,
|
||||
constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ },
|
||||
|
|
|
@ -285,17 +285,15 @@ end
|
|||
|
||||
describe "Groups", "routing" do
|
||||
let(:name) { 'complex.group-namegit' }
|
||||
|
||||
before do
|
||||
allow_any_instance_of(GroupUrlConstrainer).to receive(:matches?).and_return(true)
|
||||
end
|
||||
let!(:group) { create(:group, name: name) }
|
||||
|
||||
it "to #show" do
|
||||
expect(get("/groups/#{name}")).to route_to('groups#show', id: name)
|
||||
end
|
||||
|
||||
it "also supports nested groups" do
|
||||
expect(get("/#{name}/#{name}")).to route_to('groups#show', id: "#{name}/#{name}")
|
||||
nested_group = create(:group, parent: group)
|
||||
expect(get("/#{name}/#{nested_group.name}")).to route_to('groups#show', id: "#{name}/#{nested_group.name}")
|
||||
end
|
||||
|
||||
it "also display group#show on the short path" do
|
||||
|
@ -313,10 +311,6 @@ describe "Groups", "routing" do
|
|||
it "to #members" do
|
||||
expect(get("/groups/#{name}/group_members")).to route_to('groups/group_members#index', group_id: name)
|
||||
end
|
||||
|
||||
it "also display group#show with slash in the path" do
|
||||
expect(get('/group/subgroup')).to route_to('groups#show', id: 'group/subgroup')
|
||||
end
|
||||
end
|
||||
|
||||
describe HealthCheckController, 'routing' do
|
||||
|
|
Loading…
Reference in New Issue