diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 16:12:47 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 16:12:47 +0100 |
| commit | 9c15822fc08429044db508a9e77aa0834ec0cd43 (patch) | |
| tree | 2d666048ca617a619e3a7a6cb78dc9293658290a /config | |
| parent | eacf8b74c5f57bd594485b9fe20e91c933d8b9bb (diff) | |
| parent | 93e83afb39aa83d498fee1ebcab422b517ae6ba7 (diff) | |
| download | gitlab-ce-9c15822fc08429044db508a9e77aa0834ec0cd43.tar.gz | |
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | config/routes/test.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 1da226a3b57..2584981bb04 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -99,5 +99,7 @@ Rails.application.routes.draw do end end + draw :test if Rails.env.test? + get '*unmatched_route', to: 'application#route_not_found' end diff --git a/config/routes/test.rb b/config/routes/test.rb new file mode 100644 index 00000000000..ac477cdbbbc --- /dev/null +++ b/config/routes/test.rb @@ -0,0 +1,2 @@ +get '/unicorn_test/pid' => 'unicorn_test#pid' +post '/unicorn_test/kill' => 'unicorn_test#kill' |