diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-07-01 21:56:17 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-07-01 21:56:17 +0200 |
| commit | 9e211091a85c20adea63b89111240350d6d8ffcb (patch) | |
| tree | b4ba0fe2c948cdd32ed650371820c3ec376de83d /config | |
| parent | b227355973fac017905833409e8cb721f9dbd36d (diff) | |
| download | gitlab-ce-9e211091a85c20adea63b89111240350d6d8ffcb.tar.gz | |
Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-lines
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index a93996cec72..51d93e8cde0 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -96,7 +96,6 @@ class Settings < Settingslogic end end - # Default settings Settings['ldap'] ||= Settingslogic.new({}) Settings.ldap['enabled'] = false if Settings.ldap['enabled'].nil? @@ -124,7 +123,6 @@ if Settings.ldap['enabled'] || Rails.env.test? end end - Settings['omniauth'] ||= Settingslogic.new({}) Settings.omniauth['enabled'] = false if Settings.omniauth['enabled'].nil? Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['auto_sign_in_with_provider'].nil? @@ -218,7 +216,6 @@ Settings.gitlab['restricted_signup_domains'] ||= [] Settings.gitlab['import_sources'] ||= %w[github bitbucket gitlab gitorious google_code fogbugz git gitlab_project] Settings.gitlab['trusted_proxies'] ||= [] - # # CI # @@ -348,7 +345,6 @@ Settings.git['timeout'] ||= 10 Settings['satellites'] ||= Settingslogic.new({}) Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "tmp/repo_satellites/", Rails.root) - # # Extra customization # diff --git a/config/routes.rb b/config/routes.rb index c04780fec88..1572656b8c5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -133,7 +133,6 @@ Rails.application.routes.draw do # resources :notification_settings, only: [:create, :update] - # # Import # @@ -466,7 +465,6 @@ Rails.application.routes.draw do resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do resources(:projects, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ }, except: [:new, :create, :index], path: "/") do - member do put :transfer delete :remove_fork |