summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb6
-rw-r--r--config/routes/project.rb2
-rw-r--r--config/webpack.config.js2
3 files changed, 10 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 1a851da6203..1da226a3b57 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -39,6 +39,12 @@ Rails.application.routes.draw do
# Health check
get 'health_check(/:checks)' => 'health_check#index', as: :health_check
+ scope path: '-', controller: 'health' do
+ get :liveness
+ get :readiness
+ get :metrics
+ end
+
# Koding route
get 'koding' => 'koding#index'
diff --git a/config/routes/project.rb b/config/routes/project.rb
index e38f0537143..f5009186344 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -135,6 +135,8 @@ constraints(ProjectUrlConstrainer.new) do
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
diff --git a/config/webpack.config.js b/config/webpack.config.js
index dc431e4d566..e3bc939d578 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -41,6 +41,7 @@ var config = {
pdf_viewer: './blob/pdf_viewer.js',
profile: './profile/profile_bundle.js',
protected_branches: './protected_branches/protected_branches_bundle.js',
+ protected_tags: './protected_tags',
snippet: './snippet/snippet_bundle.js',
stl_viewer: './blob/stl_viewer.js',
terminal: './terminal/terminal_bundle.js',
@@ -48,6 +49,7 @@ var config = {
users: './users/users_bundle.js',
vue_pipelines: './vue_pipelines_index/index.js',
issue_show: './issue_show/index.js',
+ group: './group.js',
},
output: {