diff options
author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-10-09 09:47:47 +0200 |
---|---|---|
committer | Ciro Santilli <ciro.santilli@gmail.com> | 2015-01-01 21:12:00 +0100 |
commit | 33c9f05c6bb90a995ddc685b4a22479f17c575e5 (patch) | |
tree | 8dd374b515eeb5e9194ab3c52e46b569cfb5f2e8 /config/application.rb | |
parent | ac1584249c262e447a6360734597fa17fe077718 (diff) | |
download | gitlab-ce-33c9f05c6bb90a995ddc685b4a22479f17c575e5.tar.gz |
Append in place for strings and arrays
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/application.rb b/config/application.rb index 8a280de6fac..a7d371c78ea 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,11 +12,11 @@ module Gitlab # -- all .rb files in that directory are automatically loaded. # Custom directories with classes and modules you want to be autoloadable. - config.autoload_paths += %W(#{config.root}/lib - #{config.root}/app/models/hooks - #{config.root}/app/models/concerns - #{config.root}/app/models/project_services - #{config.root}/app/models/members) + config.autoload_paths.push(*%W(#{config.root}/lib + #{config.root}/app/models/hooks + #{config.root}/app/models/concerns + #{config.root}/app/models/project_services + #{config.root}/app/models/members)) # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. @@ -31,7 +31,7 @@ module Gitlab config.encoding = "utf-8" # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] + config.filter_parameters.push(*[:password]) # Enable escaping HTML in JSON. config.active_support.escape_html_entities_in_json = true |