diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2014-11-12 13:14:13 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2014-11-12 13:14:13 +0200 |
| commit | 1a7e3476351979d37cd5fa2b7b5800717487d758 (patch) | |
| tree | 944564aabc35977b9771933ced239d46ddece10b /config/application.rb | |
| parent | 8146271d4043a91e8f65c7af41c6c015e7d155c3 (diff) | |
| parent | c58edd7c708c39a6e7c60bd96c7f97ced370f304 (diff) | |
| download | gitlab-ce-1a7e3476351979d37cd5fa2b7b5800717487d758.tar.gz | |
Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences
Conflicts:
CHANGELOG
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 0484e786890..44a5d68d126 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,11 +22,6 @@ module Gitlab # :all can be used as a placeholder for all plugins not explicitly named. # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # NOTE: Please prefer set time zone on config/gitlab.yml configuration file. - # config.time_zone = 'Central Time (US & Canada)' - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de |