diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-22 10:07:15 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-22 10:07:15 +0300 |
| commit | 2b10520b306697d7cbae8f3f84ca30cacc821fa4 (patch) | |
| tree | 0140f05d7c568ed829d13c52bf35d7df7f51fb9c /config | |
| parent | 7f1633e2949acb53c25b92dd54a0f0a3ba2a9e6c (diff) | |
| parent | 33c9f05c6bb90a995ddc685b4a22479f17c575e5 (diff) | |
Merge pull request #7999 from cirosantilli/append-inplace
Append in place for strings and arrays [failure unrelated]
Diffstat (limited to 'config')
| -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 |