From 8e42fe9450532321d2af24a3aaad757b863636e6 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 25 Jun 2019 13:53:57 -0500
Subject: Delineate additional EE-only routes

---
 config/routes.rb         | 27 +++++++++++++++++++--------
 config/routes/project.rb | 18 ++++++++++--------
 2 files changed, 29 insertions(+), 16 deletions(-)

(limited to 'config')

diff --git a/config/routes.rb b/config/routes.rb
index f3f30c67a6c..a42fc037227 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -30,9 +30,12 @@ Rails.application.routes.draw do
   # This prefixless path is required because Jira gets confused if we set it up with a path
   # More information: https://gitlab.com/gitlab-org/gitlab-ee/issues/6752
   scope path: '/login/oauth', controller: 'oauth/jira/authorizations', as: :oauth_jira do
-    get :authorize, action: :new
-    get :callback
-    post :access_token
+    Gitlab.ee do
+      get :authorize, action: :new
+      get :callback
+      post :access_token
+    end
+
     # This helps minimize merge conflicts with CE for this scope block
     match '*all', via: [:get, :post], to: proc { [404, {}, ['']] }
   end
@@ -46,9 +49,12 @@ Rails.application.routes.draw do
   get '/autocomplete/users/:id' => 'autocomplete#user'
   get '/autocomplete/projects' => 'autocomplete#projects'
   get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
-  get '/autocomplete/project_groups' => 'autocomplete#project_groups'
   get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
 
+  Gitlab.ee do
+    get '/autocomplete/project_groups' => 'autocomplete#project_groups'
+  end
+
   # Search
   get 'search' => 'search#show'
   get 'search/autocomplete' => 'search#autocomplete', as: :search_autocomplete
@@ -78,8 +84,10 @@ Rails.application.routes.draw do
 
       resources :issues, module: :boards, only: [:index, :update]
 
-      resources :users, module: :boards, only: [:index]
-      resources :milestones, module: :boards, only: [:index]
+      Gitlab.ee do
+        resources :users, module: :boards, only: [:index]
+        resources :milestones, module: :boards, only: [:index]
+      end
     end
 
     get 'acme-challenge/' => 'acme_challenges#show'
@@ -92,8 +100,11 @@ Rails.application.routes.draw do
 
     draw :operations
     draw :instance_statistics
-    draw :smartcard
-    draw :jira_connect
+
+    Gitlab.ee do
+      draw :smartcard
+      draw :jira_connect
+    end
 
     if ENV['GITLAB_ENABLE_CHAOS_ENDPOINTS']
       get '/chaos/leakmem' => 'chaos#leakmem'
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 18d72acd214..93940c3b99a 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -210,8 +210,11 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
       namespace :prometheus do
         resources :metrics, constraints: { id: %r{[^\/]+} }, only: [:index, :new, :create, :edit, :update, :destroy] do
-          post :validate_query, on: :collection
           get :active_common, on: :collection
+
+          Gitlab.ee do
+            post :validate_query, on: :collection
+          end
         end
 
         Gitlab.ee do
@@ -359,13 +362,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           get :builds
           get :failures
           get :status
-          get :security
-          get :licenses
-        end
 
-        member do
-          resources :stages, only: [], param: :name do
-            post :play_manual
+          Gitlab.ee do
+            get :security
+            get :licenses
           end
         end
 
@@ -508,7 +508,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :issue_links, only: [:index, :create, :destroy], as: 'links', path: 'links'
+        Gitlab.ee do
+          resources :issue_links, only: [:index, :create, :destroy], as: 'links', path: 'links'
+        end
       end
 
       resources :notes, only: [:create, :destroy, :update], concerns: :awardable, constraints: { id: /\d+/ } do
-- 
cgit v1.2.1