Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_data_source

1 files changed, 11 insertions, 32 deletions

diff --git a/config/routes/project.rb b/config/routes/project.rb
index 39144b74629..120eccf5418 100644
--- a/config/routes/project.rb
+++ b/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,13 +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 :variables, only: [:index, :show, :update, :create, :destroy]
       resources :triggers, only: [:index, :create, :edit, :update, :destroy] do
         member do
@@ -166,7 +136,7 @@ constraints(ProjectUrlConstrainer.new) do
         end
 
         collection do
-          get :folder, path: 'folders/:id'
+          get :folder, path: 'folders/*id', constraints: { format: /(html|json)/ }
         end
 
         resources :deployments, only: [:index]
@@ -223,7 +193,15 @@ constraints(ProjectUrlConstrainer.new) do
         end
       end
 
-      resources :container_registry, only: [:index, :destroy], constraints: { id: Gitlab::Regex.container_registry_reference_regex }
+      resources :container_registry, only: [:index, :destroy],
+                                     controller: 'registry/repositories'
+
+      namespace :registry do
+        resources :repository, only: [] do
+          resources :tags, only: [:destroy],
+                           constraints: { id: Gitlab::Regex.container_registry_reference_regex }
+        end
+      end
 
       resources :milestones, constraints: { id: /\d+/ } do
         member do
@@ -252,6 +230,7 @@ constraints(ProjectUrlConstrainer.new) do
           get :referenced_merge_requests
           get :related_branches
           get :can_create_branch
+          get :rendered_title
         end
         collection do
           post  :bulk_update