summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-30 18:22:48 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-30 18:22:48 +0000
commitde20bd5b31715f096db3fb0155c82b0eea992b6c (patch)
tree1eaaca4fe32df60f6e813a1399a1959fb9481502 /config
parentb05981f019581aab030fbacb7cd7bf5506d12266 (diff)
parentfdcb7e36859ed6cf2ce5cb1117391d791213e80e (diff)
downloadgitlab-ce-de20bd5b31715f096db3fb0155c82b0eea992b6c.tar.gz
Merge branch 'rubocop/enable-space-before-comma-cop' into 'master'
Enable Style/SpaceBeforeComma rubocop cop No spaces before commas. See #17478 See merge request !4360
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 9a5d0074a0a..428302d0fd7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -421,7 +421,11 @@ Rails.application.routes.draw do
resources :projects, constraints: { id: /[^\/]+/ }, only: [:index, :new, :create]
- devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks, registrations: :registrations , passwords: :passwords, sessions: :sessions, confirmations: :confirmations }
+ devise_for :users, controllers: { omniauth_callbacks: :omniauth_callbacks,
+ registrations: :registrations,
+ passwords: :passwords,
+ sessions: :sessions,
+ confirmations: :confirmations }
devise_scope :user do
get '/users/auth/:provider/omniauth_error' => 'omniauth_callbacks#omniauth_error', as: :omniauth_error
@@ -789,7 +793,7 @@ Rails.application.routes.draw do
end
# Get all keys of user
- get ':username.keys' => 'profiles/keys#get_keys' , constraints: { username: /.*/ }
+ get ':username.keys' => 'profiles/keys#get_keys', constraints: { username: /.*/ }
get ':id' => 'namespaces#show', constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ }
end