diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-26 21:13:58 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-27 16:16:15 +0300 |
commit | 3be445c58e820035a7da6800beba6a13f3ca742f (patch) | |
tree | eac8d7dd08ee288976e70b553b99c37f33c41e4b | |
parent | b5797168ec529c179342b8c292c2b52f0cbe41ee (diff) |
Revert "Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".""
This reverts commit 9dbd5b3cfad10b214ae5ef27c39246bbb74a5077.
-rw-r--r-- | app/models/group.rb | 2 | ||||
-rw-r--r-- | config/routes/group.rb | 33 | ||||
-rw-r--r-- | spec/models/group_spec.rb | 6 |
3 files changed, 25 insertions, 16 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 552e1154df6..d9e90cd256a 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -68,7 +68,7 @@ class Group < Namespace end def web_url - Gitlab::Routing.url_helpers.group_url(self) + Gitlab::Routing.url_helpers.group_canonical_url(self) end def human_name diff --git a/config/routes/group.rb b/config/routes/group.rb index 4838c9d91c6..826048ba196 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -12,23 +12,26 @@ constraints(GroupUrlConstrainer.new) do end end -resources :groups, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do - member do - get :issues - get :merge_requests - get :projects - get :activity - end - - scope module: :groups do - resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do - post :resend_invite, on: :member - delete :leave, on: :collection +scope constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do + resources :groups, except: [:show] do + member do + get :issues + get :merge_requests + get :projects + get :activity end - resource :avatar, only: [:destroy] - resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create] + scope module: :groups do + resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do + post :resend_invite, on: :member + delete :leave, on: :collection + end - resources :labels, except: [:show], constraints: { id: /\d+/ } + resource :avatar, only: [:destroy] + resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create] + + resources :labels, except: [:show], constraints: { id: /\d+/ } + end end + get 'groups/:id' => 'groups#show', as: :group_canonical end diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index ac862055ebc..47f89f744cb 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -265,4 +265,10 @@ describe Group, models: true do members end + + describe '#web_url' do + it 'returns the canonical URL' do + expect(group.web_url).to include("groups/#{group.name}") + end + end end |