diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 18:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 18:08:01 +0300 |
| commit | 53b1f4eaa2a451aaba908a5fee7ce97a930021ac (patch) | |
| tree | 66501ec0de9f529ee1cfc7cd6c4b481b1fc76662 /config | |
| parent | 684d65316ac77c62f47d68b9926eea8af30db227 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 1 | ||||
| -rw-r--r-- | config/routes/ci.rb | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/config/routes.rb b/config/routes.rb index a8b2a9b6656..c4a1f693048 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -19,7 +19,6 @@ Rails.application.routes.draw do draw :sherlock draw :development - draw :ci use_doorkeeper do controllers applications: 'oauth/applications', diff --git a/config/routes/ci.rb b/config/routes/ci.rb deleted file mode 100644 index ebd321ed097..00000000000 --- a/config/routes/ci.rb +++ /dev/null @@ -1,5 +0,0 @@ -namespace :ci do - resource :lint, only: :show - - root to: redirect('') -end |