diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-08-22 14:58:10 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-08-22 14:58:10 +0200 |
| commit | 2e91f18143d42831c37b7429c3583fbd9b4d49b8 (patch) | |
| tree | acb3a7ec63872f77a0d71c51df27e1831994ce32 /config | |
| parent | 3366e38cc1632eba4c9e8683555c6fde6efd5d48 (diff) | |
| parent | 78a0d27e98cea4ed1b59377edc93588127b297fe (diff) | |
| download | gitlab-ce-2e91f18143d42831c37b7429c3583fbd9b4d49b8.tar.gz | |
Merge branch 'master' into backstage/gb/rename-ci-cd-processing-sidekiq-queues
* master: (115 commits)
Use event-based waiting in Gitlab::JobWaiter
Make sure repository's removal work for legacy and hashed storages
Use `@hashed` prefix for hashed paths on disk, to avoid collision with existing ones
Refactor project and storage types
Prevent using gitlab import task when hashed storage is enabled
Some codestyle changes and fixes for GitLab pages
Removed some useless code, codestyle changes and removed an index
Fix repository reloading in some specs
Changelog
Moving away from the "extend" based factory to a more traditional one.
Enable automatic hashed storage for new projects by application settings
New storage is now "Hashed" instead of "UUID"
Add UUID Storage to Project
Move create_repository back to project model as we can use disk_path and share it
Codestyle: move hooks to the same place and move dependent methods to private
Use non-i18n values for setting new group-level issue/MR button text
indexes external issue tracker
copyedit
indexes user/search/ from /user/index
Correctly encode string params for Gitaly's TreeEntries RPC
...
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/ci.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/routes/ci.rb b/config/routes/ci.rb index 8d23aa8fbf6..cbd4c2db852 100644 --- a/config/routes/ci.rb +++ b/config/routes/ci.rb @@ -1,8 +1,4 @@ namespace :ci do - # CI API - Ci::API::API.logger Rails.logger - mount Ci::API::API => '/api' - resource :lint, only: [:show, :create] root to: redirect('/') |