Move projects controllers/views in Projects module

app/views/wikis/_nav.html.haml → app/views/projects/wikis/_nav.html.haml

@@ -16,4 +16,4 @@
         %i.icon-plus
         New Page
-= render 'wikis/new'
+= render 'projects/wikis/new'

app/views/wikis/edit.html.haml → app/views/projects/wikis/edit.html.haml

-= render 'wikis/nav'
+= render 'nav'
 %h3.page_title
   Editing page
   = render 'main_links'

app/views/wikis/git_access.html.haml → app/views/projects/wikis/git_access.html.haml

-= render 'wikis/nav'
+= render 'nav'
 %h3.page_title
   Git Access
   %strong= @gollum_wiki.path_with_namespace

app/views/wikis/history.html.haml → app/views/projects/wikis/history.html.haml

-= render 'wikis/nav'
+= render 'nav'
 %h3.page_title
   %span.light History for
   = @wiki.title.titleize

app/views/wikis/pages.html.haml → app/views/projects/wikis/pages.html.haml

-= render 'wikis/nav'
+= render 'nav'
 %h3.page_title
   All Pages
   = render 'main_links'

app/views/wikis/show.html.haml → app/views/projects/wikis/show.html.haml

-= render 'wikis/nav'
+= render 'nav'
 %h3.page_title
   = @wiki.title.titleize
   = render 'main_links'

app/views/shared/_merge_requests.html.haml

@@ -6,7 +6,7 @@
         = link_to_project project
       %ul.well-list.mr-list
         - group[1].each do |merge_request|
-          = render(partial: 'merge_requests/merge_request', locals: {merge_request: merge_request})
+          = render 'projects/merge_requests/merge_request', merge_request: merge_request
   %hr
   = paginate @merge_requests, theme: "gitlab"

app/views/team_members/new.html.haml

-= render "team_members/form"

config/routes.rb

@@ -160,135 +160,135 @@ Gitlab::Application.routes.draw do
       get :autocomplete_sources
     end
-    resources :blob,    only: [:show], constraints: {id: /.+/}
-    resources :raw,    only: [:show], constraints: {id: /.+/}
-    resources :tree,    only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
-    resources :edit_tree,    only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
-    resources :commit,  only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
-    resources :commits, only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
-    resources :compare, only: [:index, :create]
-    resources :blame,   only: [:show], constraints: {id: /.+/}
-    resources :network,   only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
-    resources :graphs, only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
-    match "/compare/:from...:to" => "compare#show", as: "compare", via: [:get, :post], constraints: {from: /.+/, to: /.+/}
-
     scope module: :projects do
-      resources :snippets do
-        member do
-          get "raw"
+      resources :blob,    only: [:show], constraints: {id: /.+/}
+      resources :raw,    only: [:show], constraints: {id: /.+/}
+      resources :tree,    only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
+      resources :edit_tree,    only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
+      resources :commit,  only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
+      resources :commits, only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
+      resources :compare, only: [:index, :create]
+      resources :blame,   only: [:show], constraints: {id: /.+/}
+      resources :network,   only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
+      resources :graphs, only: [:show], constraints: {id: /(?:[^.]|\.(?!json$))+/, format: /json/}
+      match "/compare/:from...:to" => "compare#show", as: "compare", via: [:get, :post], constraints: {from: /.+/, to: /.+/}
+
+        resources :snippets do
+          member do
+            get "raw"
+          end
         end
-      end
-    end
-    resources :wikis, only: [:show, :edit, :destroy, :create] do
-      collection do
-        get :pages
-        put ':id' => 'wikis#update'
-        get :git_access
-      end
-      member do
-        get "history"
+      resources :wikis, only: [:show, :edit, :destroy, :create] do
+        collection do
+          get :pages
+          put ':id' => 'wikis#update'
+          get :git_access
+        end
+        member do
+          get "history"
+        end
       end
-    end
-    resource :wall, only: [:show] do
-      member do
-        get 'notes'
+      resource :wall, only: [:show] do
+        member do
+          get 'notes'
+        end
       end
-    end
-    resource :repository, only: [:show] do
-      member do
-        get "branches"
-        get "tags"
-        get "stats"
-        get "archive"
+      resource :repository, only: [:show] do
+        member do
+          get "branches"
+          get "tags"
+          get "stats"
+          get "archive"
+        end
       end
-    end
-    resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
-      member do
-        get :test
+      resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
+        member do
+          get :test
+        end
       end
-    end
-    resources :deploy_keys do
-      member do
-        put :enable
-        put :disable
+      resources :deploy_keys do
+        member do
+          put :enable
+          put :disable
+        end
       end
-    end
-    resources :protected_branches, only: [:index, :create, :destroy]
-    resources :refs, only: [] do
-      collection do
-        get "switch"
-      end
-      member do
-        # tree viewer logs
-        get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ }
-        get "logs_tree/:path" => "refs#logs_tree",
-          as: :logs_file,
-          constraints: {
-            id:   /[a-zA-Z.0-9\/_\-#%+]+/,
-            path: /.*/
-          }
+      resources :protected_branches, only: [:index, :create, :destroy]
+      resources :refs, only: [] do
+        collection do
+          get "switch"
+        end
+        member do
+          # tree viewer logs
+          get "logs_tree", constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ }
+          get "logs_tree/:path" => "refs#logs_tree",
+            as: :logs_file,
+            constraints: {
+              id:   /[a-zA-Z.0-9\/_\-#%+]+/,
+              path: /.*/
+            }
+        end
       end
-    end
-    resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
-      member do
-        get :diffs
-        get :automerge
-        get :automerge_check
-        get :ci_status
-      end
-      collection do
-        get :branch_from
-        get :branch_to
+      resources :merge_requests, constraints: {id: /\d+/}, except: [:destroy] do
+        member do
+          get :diffs
+          get :automerge
+          get :automerge_check
+          get :ci_status
+        end
+        collection do
+          get :branch_from
+          get :branch_to
+        end
       end
-    end
-    resources :hooks, only: [:index, :create, :destroy] do
-      member do
-        get :test
+      resources :hooks, only: [:index, :create, :destroy] do
+        member do
+          get :test
+        end
       end
-    end
-    resources :team, controller: 'team_members', only: [:index]
-    resources :milestones, except: [:destroy]
-    resources :labels, only: [:index] do
-      collection do
-        post :generate
+      resources :team, controller: 'team_members', only: [:index]
+      resources :milestones, except: [:destroy]
+      resources :labels, only: [:index] do
+        collection do
+          post :generate
+        end
       end
-    end
-    resources :issues, except: [:destroy] do
-      collection do
-        post  :bulk_update
+      resources :issues, except: [:destroy] do
+        collection do
+          post  :bulk_update
+        end
       end
-    end
-    resources :team_members, except: [:index, :edit] do
-      collection do
-        # Used for import team
-        # from another project
-        get :import
-        post :apply_import
+      resources :team_members, except: [:index, :edit] do
+        collection do
+          # Used for import team
+          # from another project
+          get :import
+          post :apply_import
+        end
       end
-    end
-    resources :notes, only: [:index, :create, :destroy] do
-      collection do
-        post :preview
+      resources :notes, only: [:index, :create, :destroy] do
+        collection do
+          post :preview
+        end
+      end
       end
-    end
   end
   root to: "dashboard#show"