diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-30 17:20:56 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-30 17:20:56 +0000 |
| commit | 6eaf327a57149739fb6b14e2396181cc95e687ff (patch) | |
| tree | fc0cb72be5cbcc75a55ebe5f6329f112cadcb7fc /config | |
| parent | a1565182e9d0c404f2bd18d960a282e02f650fea (diff) | |
| parent | c370dce01c95ff3d2cf102f4bdcf8347e3764893 (diff) | |
| download | gitlab-ce-6eaf327a57149739fb6b14e2396181cc95e687ff.tar.gz | |
Merge branch 'rubocop/enable-redundant-parentheses-cop' into 'master'
Enable Style/RedundantParentheses rubocop cop
Checks for parentheses that seem not to serve any purpose.
See #17478
See merge request !4361
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/session_store.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 599dabb9e50..0d9d87bac00 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -23,6 +23,6 @@ else secure: Gitlab.config.gitlab.https, httponly: true, expires_in: Settings.gitlab['session_expire_delay'] * 60, - path: (Rails.application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root + path: Rails.application.config.relative_url_root.nil? ? '/' : Gitlab::Application.config.relative_url_root ) end |