diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-01-09 10:54:02 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-01-09 10:54:02 -0700 |
| commit | 6625f479f857aefde855f45d3e2c820bfbb872e3 (patch) | |
| tree | 6419cb0907d3ccef1061394a885cebf93a20aaae /config | |
| parent | 55df55367f68ca0d1df2ad13363c98ec62fc3930 (diff) | |
| parent | 6c62482144e786f83ed62298e06604e46e93107e (diff) | |
| download | gitlab-ce-6625f479f857aefde855f45d3e2c820bfbb872e3.tar.gz | |
Merge branch 'master' into auto-pipelines-vue
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 4 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 4d20acbef7a..26e2dc9e6e7 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -307,6 +307,10 @@ constraints(ProjectUrlConstrainer.new) do end end + namespace :settings do + resource :members, only: [:show] + end + # Since both wiki and repository routing contains wildcard characters # its preferable to keep it below all other project routes draw :wiki diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index c22964179d9..022b0e80917 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -29,6 +29,7 @@ - [email_receiver, 2] - [emails_on_push, 2] - [mailers, 2] + - [use_key, 1] - [repository_fork, 1] - [repository_import, 1] - [project_service, 1] |