Merge branch 'dashboard-groups' into 'master'

Move profile groups page to dashboard

For #2069

See merge request !1654

1 files changed, 6 insertions, 5 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 6dd9ded0193..1b855cd7a32 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -193,11 +193,6 @@ Gitlab::Application.routes.draw do
       end
       resources :keys
       resources :emails, only: [:index, :create, :destroy]
-      resources :groups, only: [:index] do
-        member do
-          delete :leave
-        end
-      end
       resource :avatar, only: [:destroy]
     end
   end
@@ -220,6 +215,12 @@ Gitlab::Application.routes.draw do
 
     scope module: :dashboard do
       resources :milestones, only: [:index, :show]
+
+      resources :groups, only: [:index] do
+        member do
+          delete :leave
+        end
+      end
     end
   end