Add latest changes from gitlab-org/gitlab@master

1 files changed, 27 insertions, 28 deletions

diff --git a/config/routes/project.rb b/config/routes/project.rb
index dacc433784d..3f913683b00 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -191,6 +191,31 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           get 'proxy/:datasource_id/*proxy_path', to: 'grafana_api#proxy'
           get :metrics_dashboard, to: 'grafana_api#metrics_dashboard'
         end
+
+        resource :mattermost, only: [:new, :create]
+        resource :variables, only: [:show, :update]
+        resources :triggers, only: [:index, :create, :edit, :update, :destroy]
+
+        resource :mirror, only: [:show, :update] do
+          member do
+            get :ssh_host_keys, constraints: { format: :json }
+            post :update_now
+          end
+        end
+
+        resource :cycle_analytics, only: [:show]
+
+        namespace :cycle_analytics do
+          scope :events, controller: 'events' do
+            get :issue
+            get :plan
+            get :code
+            get :test
+            get :review
+            get :staging
+            get :production
+          end
+        end
       end
       # End of the /-/ scope.
 
@@ -235,8 +260,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
       end
 
-      resource :mattermost, only: [:new, :create]
-
       namespace :prometheus do
         resources :metrics, constraints: { id: %r{[^\/]+} }, only: [:index, :new, :create, :edit, :update, :destroy] do
           get :active_common, on: :collection
@@ -364,17 +387,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         put '/service_desk' => 'service_desk#update', as: :service_desk_refresh
       end
 
-      resource :variables, only: [:show, :update]
-
-      resources :triggers, only: [:index, :create, :edit, :update, :destroy]
-
-      resource :mirror, only: [:show, :update] do
-        member do
-          get :ssh_host_keys, constraints: { format: :json }
-          post :update_now
-        end
-      end
-
       Gitlab.ee do
         resources :push_rules, constraints: { id: /\d+/ }, only: [:update]
       end
@@ -463,20 +475,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
       end
 
-      resource :cycle_analytics, only: [:show]
-
-      namespace :cycle_analytics do
-        scope :events, controller: 'events' do
-          get :issue
-          get :plan
-          get :code
-          get :test
-          get :review
-          get :staging
-          get :production
-        end
-      end
-
       namespace :serverless do
         scope :functions do
           get '/:environment_id/:id', to: 'functions#show'
@@ -678,7 +676,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
                                             :network, :graphs, :autocomplete_sources,
                                             :project_members, :deploy_keys, :deploy_tokens,
                                             :labels, :milestones, :services, :boards, :releases,
-                                            :forks, :group_links, :import, :avatar)
+                                            :forks, :group_links, :import, :avatar, :mirror,
+                                            :cycle_analytics, :mattermost, :variables, :triggers)
     end
   end
 end