diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-10 18:38:26 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-10 18:38:26 +0800 |
| commit | 75ded1c73e5c1499947a3c951d9af54abfd2fd5c (patch) | |
| tree | d5ce58f9ed21489745f6e28d76809699b337f775 /config | |
| parent | 3aed06cfa387406c2e0257a8783bc05b53d4385a (diff) | |
| parent | c98add157732004d9a2eaa39770edf84eaca6896 (diff) | |
| download | gitlab-ce-75ded1c73e5c1499947a3c951d9af54abfd2fd5c.tar.gz | |
Merge remote-tracking branch 'upstream/master' into test-pg-mysql
* upstream/master: (238 commits)
Periodically clean up temporary upload files to recover storage space
Add a name field to the group edit form
Remove the User#is_admin? method
Fix specs
Enable RSpec/DescribeSymbol; update .rubocop_todo.yml
Update rubocop-rspec 1.12.0 -> 1.15.0
Rename displaying_blame to blame
Actually include WaitForAjax!
Don't show Copy contents button on Blame page
alfredo review changes
Give explicit height to SVG icons for Safari
Update MR title change icon
Put back usernames in activity and profile feed
Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run
Revert yarn.lock changes
add CHANGELOG.md entry for !10522
upgrade webpack-dev-server to fix issues with SockJS causing odd reload behavior in firefox
upgrade webpack to v2.3.3 to resolve sourcemap issues
Rever yarn.lock changes
Revert yarn.lock file changes
...
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 6 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
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: { |