summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-07 11:20:13 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-10-07 11:20:13 +0200
commit90cb56f033794812b0680e316e2075fe03b45ad0 (patch)
treead0ff7cb2e7f817e08ba69db17f8f72f1a78113f
parentd790b2cbb814a429268361cf6f3198e7ffb938d8 (diff)
parent70776c71b0dff9cf3fb92aadc9a1ef1e75b77a21 (diff)
downloadgitlab-ce-90cb56f033794812b0680e316e2075fe03b45ad0.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
-rw-r--r--config/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb
index 99dfafdb786..e36df913d0b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,7 +2,7 @@ require File.expand_path('../boot', __FILE__)
require 'rails/all'
require 'devise'
-
+I18n.config.enforce_available_locales = false
Bundler.require(:default, Rails.env)
module Gitlab