Merge branch 'master' into staging

Leandro Santos
2 parents 1fbb9828 e3693641
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
config/environment.rb
@@ -3,7 +3,7 @@ require_relative &#39;application&#39;
 Noosfero::Application.initialize!
 # load a local configuration if present, but not under test environment.
-if ENV['RAILS_ENV'].in? %w[test cucumber]
+unless ENV['RAILS_ENV'].in? %w[test cucumber]
   localconfigfile = Rails.root.join('config', 'local.rb')
   require localconfigfile if File.exists? localconfigfile
 end
	@@ -3,7 +3,7 @@ require_relative 'application'		@@ -3,7 +3,7 @@ require_relative 'application'
3	Noosfero::Application.initialize!	3	Noosfero::Application.initialize!
4		4
5	# load a local configuration if present, but not under test environment.	5	# load a local configuration if present, but not under test environment.
6	-if ENV['RAILS_ENV'].in? %w[test cucumber]	6	+unless ENV['RAILS_ENV'].in? %w[test cucumber]
7	localconfigfile = Rails.root.join('config', 'local.rb')	7	localconfigfile = Rails.root.join('config', 'local.rb')
8	require localconfigfile if File.exists? localconfigfile	8	require localconfigfile if File.exists? localconfigfile
9	end	9	end