Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

90cb56f0 · Marin Jankovski · d790b2cb · 70776c71 · 90cb56f0
Commit 90cb56f0 authored Oct 07, 2014 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/application.rb config/application.rb +1 -1

No files found.
--- 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