diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-01-03 02:24:37 +0300 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-01-03 02:24:37 +0300 |
| commit | 0a074f2e091d8b2f1bce49e50ecf69b667c62dc2 (patch) | |
| tree | 314027556f06514278a4f83f35813c00b2d5418f /config | |
| parent | 588219352c99213d099aff72f32d6ad9ec4830d4 (diff) | |
| parent | de25604fbca2f7005754d821d571bbcb1cc510ac (diff) | |
fix pipelines/index.html.haml merge conflict
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/inflections.rb | 2 | ||||
| -rw-r--r-- | config/routes/admin.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 3d1a41a4652..d4197da3fa9 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -10,5 +10,5 @@ # end # ActiveSupport::Inflector.inflections do |inflect| - inflect.uncountable %w(award_emoji) + inflect.uncountable %w(award_emoji project_statistics) end diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 0dd2c8f7aef..8e99239f350 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -6,7 +6,6 @@ namespace :admin do member do get :projects get :keys - get :groups put :block put :unblock put :unlock @@ -32,7 +31,7 @@ namespace :admin do scope(path: 'groups/*id', controller: :groups, - constraints: { id: Gitlab::Regex.namespace_route_regex }) do + constraints: { id: Gitlab::Regex.namespace_route_regex, format: /(html|json|atom)/ }) do scope(as: :group) do put :members_update |