diff options
| author | Phil Hughes <me@iamphill.com> | 2017-01-13 10:30:40 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-01-13 10:30:40 -0500 |
| commit | 639bca436297e65f16499c5b76a9e5ffb2b798c8 (patch) | |
| tree | 832636f41824529da2796dedc7888effd42940c9 /config | |
| parent | bdcb81be95b3287e14cf23b2f1d0849b24077360 (diff) | |
| parent | 4b43126d08972c201551fbd1fe42e85847d5e03f (diff) | |
| download | gitlab-ce-639bca436297e65f16499c5b76a9e5ffb2b798c8.tar.gz | |
Merge branch 'master' into go-go-gadget-webpack
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 4 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 5 |
3 files changed, 9 insertions, 1 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] diff --git a/config/webpack.config.js b/config/webpack.config.js index f363a9fc4a9..bd5863689fd 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -21,6 +21,7 @@ var config = { cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', diff_notes: './diff_notes/diff_notes_bundle.js', environments: './environments/environments_bundle.js', + filtered_search: './filtered_search/filtered_search_bundle.js', graphs: './graphs/graphs_bundle.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', merge_request_widget: './merge_request_widget/ci_bundle.js', @@ -31,7 +32,9 @@ var config = { terminal: './terminal/terminal_bundle.js', users: './users/users_bundle.js', lib_chart: './lib/chart.js', - lib_d3: './lib/d3.js' + lib_d3: './lib/d3.js', + vue_pagination: './vue_pagination/index.js', + vue_pipelines: './vue_pipelines_index/index.js', }, output: { |