Merge branch 'dm-no-format-suffix' into 'master'

Remove format from end of URL for URLs that take a ref or path

See merge request !10740

config/routes/project.rb

@@ -42,29 +42,6 @@ constraints(ProjectUrlConstrainer.new) do
         resources :domains, only: [:show, :new, :create, :destroy], controller: 'pages_domains', constraints: { id: /[^\/]+/ }
       end
 
-      resources :compare, only: [:index, :create] do
-        collection do
-          get :diff_for_path
-        end
-      end
-
-      get '/compare/:from...:to', to: 'compare#show', as: 'compare', constraints: { from: /.+/, to: /.+/ }
-
-      # Don't use format parameter as file extension (old 3.0.x behavior)
-      # See http://guides.rubyonrails.org/routing.html#route-globbing-and-wildcard-segments
-      scope format: false do
-        resources :network, only: [:show], constraints: { id: Gitlab::Regex.git_reference_regex }
-
-        resources :graphs, only: [:show], constraints: { id: Gitlab::Regex.git_reference_regex } do
-          member do
-            get :charts
-            get :commits
-            get :ci
-            get :languages
-          end
-        end
-      end
-
       resources :snippets, concerns: :awardable, constraints: { id: /\d+/ } do
         member do
           get 'raw'
@@ -128,15 +105,6 @@ constraints(ProjectUrlConstrainer.new) do
         end
       end
 
-      resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
-      delete :merged_branches, controller: 'branches', action: :destroy_all_merged
-      resources :tags, only: [:index, :show, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } do
-        resource :release, only: [:edit, :update]
-      end
-
-      resources :protected_branches, only: [:index, :show, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
-      resources :protected_tags, only: [:index, :show, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
-
       resources :variables, only: [:index, :show, :update, :create, :destroy]
       resources :triggers, only: [:index, :create, :edit, :update, :destroy] do
         member do

config/routes/repository.rb

-# All routing related to repositoty browsing
+# All routing related to repository browsing
 
 resource :repository, only: [:create] do
   member do
@@ -6,83 +6,84 @@ resource :repository, only: [:create] do
   end
 end
 
-resources :refs, only: [] do
-  collection do
-    get 'switch'
+# Don't use format parameter as file extension (old 3.0.x behavior)
+# See http://guides.rubyonrails.org/routing.html#route-globbing-and-wildcard-segments
+scope format: false do
+  get '/compare/:from...:to', to: 'compare#show', as: 'compare', constraints: { from: /.+/, to: /.+/ }
+
+  resources :compare, only: [:index, :create] do
+    collection do
+      get :diff_for_path
+    end
   end
 
-  member do
-    # tree viewer logs
-    get 'logs_tree', constraints: { id: Gitlab::Regex.git_reference_regex }
-    # Directories with leading dots erroneously get rejected if git
-    # ref regex used in constraints. Regex verification now done in controller.
-    get 'logs_tree/*path' => 'refs#logs_tree', as: :logs_file, constraints: {
-      id: /.*/,
-      path: /.*/
-    }
+  resources :refs, only: [] do
+    collection do
+      get 'switch'
+    end
+
+    member do
+      # tree viewer logs
+      get 'logs_tree', constraints: { id: Gitlab::Regex.git_reference_regex }
+      # Directories with leading dots erroneously get rejected if git
+      # ref regex used in constraints. Regex verification now done in controller.
+      get 'logs_tree/*path', action: :logs_tree, as: :logs_file, format: false, constraints: {
+        id: /.*/,
+        path: /.*/
+      }
+    end
   end
-end
 
-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 constraints: { id: Gitlab::Regex.git_reference_regex } do
+    resources :network, only: [:show]
 
-scope('/blob/*id', as: :blob, controller: :blob, constraints: { id: /.+/, format: false }) do
-  get :diff
-  get '/', action: :show
-  delete '/', action: :destroy
-  post '/', action: :create
-  put '/', action: :update
-end
+    resources :graphs, only: [:show] do
+      member do
+        get :charts
+        get :commits
+        get :ci
+        get :languages
+      end
+    end
 
-get(
-  '/raw/*id',
-  to: 'raw#show',
-  constraints: { id: /.+/, format: /(html|js)/ },
-  as: :raw
-)
+    resources :branches, only: [:index, :new, :create, :destroy]
+    delete :merged_branches, controller: 'branches', action: :destroy_all_merged
+    resources :tags, only: [:index, :show, :new, :create, :destroy] do
+      resource :release, only: [:edit, :update]
+    end
 
-get(
-  '/tree/*id',
-  to: 'tree#show',
-  constraints: { id: /.+/, format: /(html|js)/ },
-  as: :tree
-)
+    resources :protected_branches, only: [:index, :show, :create, :update, :destroy]
+    resources :protected_tags, only: [:index, :show, :create, :update, :destroy]
+  end
+
+  scope constraints: { id: /.+/ }  do
+    scope controller: :blob do
+      get '/new/*id', action: :new, as: :new_blob
+      post '/create/*id', action: :create, as: :create_blob
+      get '/edit/*id', action: :edit, as: :edit_blob
+      put '/update/*id', action: :update, as: :update_blob
+      post '/preview/*id', action: :preview, as: :preview_blob
 
-get(
-  '/find_file/*id',
-  to: 'find_file#show',
-  constraints: { id: /.+/, format: /html/ },
-  as: :find_file
-)
+      scope path: '/blob/*id', as: :blob do
+        get :diff
+        get '/', action: :show
+        delete '/', action: :destroy
+        post '/', action: :create
+        put '/', action: :update
+      end
+    end
 
-get(
-  '/files/*id',
-  to: 'find_file#list',
-  constraints: { id: /(?:[^.]|\.(?!json$))+/, format: /json/ },
-  as: :files
-)
+    get '/tree/*id', to: 'tree#show', as: :tree
+    get '/raw/*id', to: 'raw#show', as: :raw
+    get '/blame/*id', to: 'blame#show', as: :blame
+    get '/commits/*id', to: 'commits#show', as: :commits
 
-post(
-  '/create_dir/*id',
-    to: 'tree#create_dir',
-    constraints: { id: /.+/ },
-    as: 'create_dir'
-)
+    post '/create_dir/*id', to: 'tree#create_dir', as: :create_dir
 
-get(
-  '/blame/*id',
-  to: 'blame#show',
-  constraints: { id: /.+/, format: /(html|js)/ },
-  as: :blame
-)
+    scope controller: :find_file do
+      get '/find_file/*id', action: :show, as: :find_file
 
-# File/dir history
-get(
-  '/commits/*id',
-  to: 'commits#show',
-  constraints: { id: /.+/, format: false },
-  as: :commits
-)
+      get '/files/*id', action: :list, as: :files
+    end
+  end
+end

spec/routing/project_routing_spec.rb

@@ -484,7 +484,7 @@ describe 'project routing' do
     end
 
     it 'to #list' do
-      expect(get('/gitlab/gitlabhq/files/master.json')).to route_to('projects/find_file#list', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'master', format: 'json')
+      expect(get('/gitlab/gitlabhq/files/master.json')).to route_to('projects/find_file#list', namespace_id: 'gitlab', project_id: 'gitlabhq', id: 'master.json')
     end
   end