Merge branch 'master' into extend_markdown_upload

# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb

3 files changed, 189 insertions, 139 deletions

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 25b082b98da..2d5e7addcd3 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -5,7 +5,7 @@ Gitlab::Application.configure do
   # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
diff --git a/config/initializers/static_files.rb b/config/initializers/static_files.rb
index bc4fe14bc1a..d9042c652bb 100644
--- a/config/initializers/static_files.rb
+++ b/config/initializers/static_files.rb
@@ -1,6 +1,6 @@
-begin
-  app = Rails.application
+app = Rails.application
 
+if app.config.serve_static_assets
   # The `ActionDispatch::Static` middleware intercepts requests for static files 
   # by checking if they exist in the `/public` directory. 
   # We're replacing it with our `Gitlab::Middleware::Static` that does the same,
@@ -12,7 +12,4 @@ begin
     app.paths["public"].first, 
     app.config.static_cache_control
   )
-rescue
-  # If ActionDispatch::Static wasn't loaded onto the stack (like in production), 
-  # an exception is raised.
 end
diff --git a/config/routes.rb b/config/routes.rb
index a2ee5f9dc26..66341f02705 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,14 +81,14 @@ Gitlab::Application.routes.draw do
 
   scope path: :uploads do
     # Note attachments and User/Group/Project avatars
-    get ":model/:mounted_as/:id/:filename", 
-        to:           "uploads#show", 
+    get ":model/:mounted_as/:id/:filename",
+        to:           "uploads#show",
         constraints:  { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /.+/ }
 
     # Project markdown uploads
-    get ":project_id/:secret/:filename", 
-        to:           "projects/uploads#show", 
-        constraints:  { project_id: /[a-zA-Z.0-9_\-]+\/[a-zA-Z.0-9_\-]+/, filename: /.+/ }
+    get ":namespace_id/:project_id/:secret/:filename",
+      to:           "projects/uploads#show",
+      constraints:  { namespace_id: /[a-zA-Z.0-9_\-]+/, project_id: /[a-zA-Z.0-9_\-]+/, filename: /.+/ }
   end
 
   #
@@ -140,9 +140,18 @@ Gitlab::Application.routes.draw do
     resource :logs, only: [:show]
     resource :background_jobs, controller: 'background_jobs', only: [:show]
 
-    resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show] do
-      member do
-        put :transfer
+    resources :namespaces, path: '/projects', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do
+      root to: 'projects#index', as: :projects
+
+      resources(:projects,
+                path: '/',
+                constraints: { id: /[a-zA-Z.0-9_\-]+/ },
+                only: [:index, :show]) do
+        root to: 'projects#show'
+
+        member do
+          put :transfer
+        end
       end
     end
 
@@ -227,172 +236,218 @@ Gitlab::Application.routes.draw do
   devise_scope :user do
     get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error
   end
+
+  root to: "dashboard#show"
+
   #
   # Project Area
   #
-  resources :projects, constraints: { id: /[a-zA-Z.0-9_\-]+\/[a-zA-Z.0-9_\-]+/ }, except: [:new, :create, :index], path: '/' do
-    member do
-      put :transfer
-      post :archive
-      post :unarchive
-      post :toggle_star
-      post :markdown_preview
-      get :autocomplete_sources
-    end
-
-    scope module: :projects do
-      # Blob routes:
-      get '/new/:id', to: 'blob#new', constraints: { id: /.+/ }, as: 'new_blob'
-      post '/create/:id', to: 'blob#create', constraints: { id: /.+/ }, as: 'create_blob'
-      get '/edit/:id', to: 'blob#edit', constraints: { id: /.+/ }, as: 'edit_blob'
-      put '/update/:id', to: 'blob#update', constraints: { id: /.+/ }, as: 'update_blob'
-      post '/preview/:id', to: 'blob#preview', constraints: { id: /.+/ }, as: 'preview_blob'
-
-      resources :blob, only: [:show, :destroy], constraints: { id: /.+/, format: false } do
-        get :diff, on: :member
+  resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do
+    resources(:projects, constraints: { id: /[a-zA-Z.0-9_\-]+/ }, except:
+              [:new, :create, :index], path: "/") do
+      member do
+        put :transfer
+        post :archive
+        post :unarchive
+        post :toggle_star
+        post :markdown_preview
+        get :autocomplete_sources
       end
 
-      resources :raw,       only: [:show], constraints: { id: /.+/ }
-      resources :tree,      only: [:show], constraints: { id: /.+/, format: /(html|js)/ }
-      resource  :avatar,    only: [:show, :destroy]
+      scope module: :projects do
+        # Blob routes:
+        get '/new/*id', to: 'blob#new', constraints: { id: /.+/ }, as: 'new_blob'
+        post '/create/*id', to: 'blob#create', constraints: { id: /.+/ }, as: 'create_blob'
+        get '/edit/*id', to: 'blob#edit', constraints: { id: /.+/ }, as: 'edit_blob'
+        put '/update/*id', to: 'blob#update', constraints: { id: /.+/ }, as: 'update_blob'
+        post '/preview/*id', to: 'blob#preview', constraints: { id: /.+/ }, as: 'preview_blob'
+
+        scope do
+          get(
+            '/blob/*id/diff',
+            to: 'blob#diff',
+            constraints: { id: /.+/, format: false },
+            as: :blob_diff
+          )
+          get(
+            '/blob/*id',
+            to: 'blob#show',
+            constraints: { id: /.+/, format: false },
+            as: :blob
+          )
+          delete(
+            '/blob/*id',
+            to: 'blob#destroy',
+            constraints: { id: /.+/, format: false }
+          )
+        end
 
-      resources :commit,    only: [:show], constraints: { id: /[[:alnum:]]{6,40}/ } do
-        get :branches, on: :member
-      end
+        scope do
+          get(
+            '/raw/*id',
+            to: 'raw#show',
+            constraints: { id: /.+/, format: /(html|js)/ },
+            as: :raw
+          )
+        end
 
-      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/ } do
-        member do
-          get :commits
+        scope do
+          get(
+            '/tree/*id',
+            to: 'tree#show',
+            constraints: { id: /.+/, format: /(html|js)/ },
+            as: :tree
+          )
         end
-      end
+        resource  :avatar,    only: [:show, :destroy]
 
-      resources :uploads, only: [:create] do
-        collection do
-          get ":secret/:filename", action: :show, as: :show, constraints: { filename: /.+/ }
+        resources :commit,    only: [:show], constraints: { id: /[[:alnum:]]{6,40}/ } do
+          get :branches, on: :member
         end
-      end
 
-      get '/compare/:from...:to' => 'compare#show', :as => 'compare',
-          :constraints => { from: /.+/, to: /.+/ }
+        resources :commits,   only: [:show], constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ }
+        resources :compare,   only: [:index, :create]
 
-      resources :snippets, constraints: { id: /\d+/ } do
-        member do
-          get 'raw'
+        scope do
+          get(
+            '/blame/*id',
+            to: 'blame#show',
+            constraints: { id: /.+/, format: /(html|js)/ },
+            as: :blame
+          )
         end
-      end
 
-      resources :wikis, only: [:show, :edit, :destroy, :create], constraints: { id: /[a-zA-Z.0-9_\-\/]+/ } do
-        collection do
-          get :pages
-          put ':id' => 'wikis#update'
-          get :git_access
+        resources :network,   only: [:show], constraints: { id: /(?:[^.]|\.(?!json$))+/, format: /json/ }
+        resources :graphs,    only: [:show], constraints: { id: /(?:[^.]|\.(?!json$))+/, format: /json/ } do
+          member do
+            get :commits
+          end
         end
 
-        member do
-          get 'history'
+        get '/compare/:from...:to' => 'compare#show', :as => 'compare',
+            :constraints => { from: /.+/, to: /.+/ }
+
+        resources :snippets, constraints: { id: /\d+/ } do
+          member do
+            get 'raw'
+          end
         end
-      end
 
-      resource :fork, only: [:new, :create]
-      resource :import, only: [:new, :create, :show]
+        resources :wikis, only: [:show, :edit, :destroy, :create], constraints: { id: /[a-zA-Z.0-9_\-\/]+/ } do
+          collection do
+            get :pages
+            put ':id' => 'wikis#update'
+            get :git_access
+          end
 
-      resource :repository, only: [:show, :create] do
-        member do
-          get 'archive', constraints: { format: Gitlab::Regex.archive_formats_regex }
+          member do
+            get 'history'
+          end
         end
-      end
 
-      resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
-        member do
-          get :test
+        resource :repository, only: [:show, :create] do
+          member do
+            get 'archive', constraints: { format: Gitlab::Regex.archive_formats_regex }
+          end
         end
-      end
 
-      resources :deploy_keys, constraints: { id: /\d+/ } do
-        member do
-          put :enable
-          put :disable
+        resources :services, constraints: { id: /[^\/]+/ }, only: [:index, :edit, :update] do
+          member do
+            get :test
+          end
         end
-      end
 
-      resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
-      resources :tags, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
-      resources :protected_branches, only: [:index, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
-
-      resources :refs, only: [] do
-        collection do
-          get 'switch'
+        resources :deploy_keys, constraints: { id: /\d+/ } do
+          member do
+            put :enable
+            put :disable
+          end
         end
 
-        member do
-          # tree viewer logs
-          get 'logs_tree', constraints: { id: Gitlab::Regex.git_reference_regex }
-          get 'logs_tree/:path' => 'refs#logs_tree', as: :logs_file, constraints: {
-            id: Gitlab::Regex.git_reference_regex,
-            path: /.*/
-          }
+        resource :fork, only: [:new, :create]
+        resource :import, only: [:new, :create, :show]
+
+        resources :refs, only: [] do
+          collection do
+            get 'switch'
+          end
+
+          member do
+            # tree viewer logs
+            get 'logs_tree', constraints: { id: Gitlab::Regex.git_reference_regex }
+            get 'logs_tree/:path' => 'refs#logs_tree', as: :logs_file, constraints: {
+              id: Gitlab::Regex.git_reference_regex,
+              path: /.*/
+            }
+          end
         end
-      end
 
-      resources :merge_requests, constraints: { id: /\d+/ }, except: [:destroy] do
-        member do
-          get :diffs
-          post :automerge
-          get :automerge_check
-          get :ci_status
+        resources :merge_requests, constraints: { id: /\d+/ }, except: [:destroy] do
+          member do
+            get :diffs
+            post :automerge
+            get :automerge_check
+            get :ci_status
+          end
+
+          collection do
+            get :branch_from
+            get :branch_to
+            get :update_branches
+          end
         end
 
-        collection do
-          get :branch_from
-          get :branch_to
-          get :update_branches
-        end
-      end
+        resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
+        resources :tags, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
+        resources :protected_branches, only: [:index, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
 
-      resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
-        member do
-          get :test
+        resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
+          member do
+            get :test
+          end
         end
-      end
 
-      resources :team, controller: 'team_members', only: [:index]
-      resources :milestones, except: [:destroy], constraints: { id: /\d+/ } do
-        member do
-          put :sort_issues
-          put :sort_merge_requests
+        resources :team, controller: 'team_members', only: [:index]
+        resources :milestones, except: [:destroy], constraints: { id: /\d+/ } do
+          member do
+            put :sort_issues
+            put :sort_merge_requests
+          end
         end
-      end
 
-      resources :labels, constraints: { id: /\d+/ } do
-        collection do
-          post :generate
+        resources :labels, constraints: { id: /\d+/ } do
+          collection do
+            post :generate
+          end
         end
-      end
 
-      resources :issues, constraints: { id: /\d+/ }, except: [:destroy] do
-        collection do
-          post  :bulk_update
+        resources :issues, constraints: { id: /\d+/ }, except: [:destroy] do
+          collection do
+            post  :bulk_update
+          end
         end
-      end
 
-      resources :team_members, except: [:index, :edit], constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ } do
-        collection do
-          delete :leave
+        resources :team_members, except: [:index, :edit], constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ } do
+          collection do
+            delete :leave
 
-          # Used for import team
-          # from another project
-          get :import
-          post :apply_import
+            # Used for import team
+            # from another project
+            get :import
+            post :apply_import
+          end
         end
-      end
 
-      resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do
-        member do
-          delete :delete_attachment
+        resources :notes, only: [:index, :create, :destroy, :update], constraints: { id: /\d+/ } do
+          member do
+            delete :delete_attachment
+          end
+        end
+
+        resources :uploads, only: [:create] do
+          collection do
+            get ":secret/:filename", action: :show, as: :show, constraints: { filename: /.+/ }
+          end
         end
       end
 
@@ -400,6 +455,4 @@ Gitlab::Application.routes.draw do
   end
 
   get ':id' => 'namespaces#show', constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ }
-
-  root to: 'dashboard#show'
 end