diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-11 14:36:56 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-11 14:36:56 +0000 |
commit | 5fcfba2780a9e5410b0a617aac67c0c45d944053 (patch) | |
tree | 514ebd2ea7c90ee7aba3c28cc40961b3bee31ae3 /config | |
parent | 4f461fd45f65dbd6900088149b48649b27a7c2ce (diff) | |
parent | a6997e339be703e769b32765ffbdbf722ac2aea5 (diff) | |
download | gitlab-ce-5fcfba2780a9e5410b0a617aac67c0c45d944053.tar.gz |
Merge branch 'dashboard-titles' into 'master'
Clean up overlap between dashboard and explore
- Clean up overlap between dashboard and explore. ... 5d785457
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
- Consistently case `Back to X` links. 260fcd45
- Link to help from signin page bottom. d92696d3
- Make Help accessible for guests. c258e977
cc @dzaporozhets
See merge request !1260
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/config/routes.rb b/config/routes.rb index 011af4825fa..fad6b3c569a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -143,6 +143,7 @@ Gitlab::Application.routes.draw do end resources :groups, only: [:index] + resources :snippets, only: [:index] root to: 'projects#trending' end @@ -263,24 +264,25 @@ Gitlab::Application.routes.draw do # # Dashboard Area # - resource :dashboard, controller: 'dashboard', only: [:show] do - member do - get :issues - get :merge_requests - get :activity - end + resource :dashboard, controller: 'dashboard', only: [] do + get :issues + get :merge_requests + get :activity scope module: :dashboard do resources :milestones, only: [:index, :show] resources :groups, only: [:index] + resources :snippets, only: [:index] - resources :projects, only: [] do + resources :projects, only: [:index] do collection do get :starred end end end + + root to: "dashboard/projects#index" end # @@ -304,7 +306,7 @@ Gitlab::Application.routes.draw do end end - resources :projects, constraints: { id: /[^\/]+/ }, only: [:new, :create] + resources :projects, constraints: { id: /[^\/]+/ }, only: [:index, :new, :create] devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks, registrations: :registrations , passwords: :passwords, sessions: :sessions, confirmations: :confirmations } @@ -312,7 +314,7 @@ Gitlab::Application.routes.draw do get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error end - root to: "root#show" + root to: "root#index" # # Project Area |