Merge pull request #6011 from jvanbaarsen/deprecation_warning_fix

Fixed the I18n deprecation warning

Merge pull request #6011 from jvanbaarsen/deprecation_warning_fix
Fixed the I18n deprecation warning
Dmitriy Zaporozhets
2 parents 50d2eae8 c466f4cc
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
config/application.rb
@@ -38,6 +38,7 @@ module Gitlab
     # 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
+    config.i18n.enforce_available_locales = false
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
	@@ -38,6 +38,7 @@ module Gitlab		@@ -38,6 +38,7 @@ module Gitlab
38	# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.	38	# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
39	# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]	39	# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
40	# config.i18n.default_locale = :de	40	# config.i18n.default_locale = :de
		41	+ config.i18n.enforce_available_locales = false
41		42
42	# Configure the default encoding used in templates for Ruby 1.9.	43	# Configure the default encoding used in templates for Ruby 1.9.
43	config.encoding = "utf-8"	44	config.encoding = "utf-8"