nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump configurate

Browse source
This commit is contained in:
Jonne Haß 2013-04-15 01:05:36 +02:00
parent 849b0befd6
commit c8eec463e5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -21,7 +21,7 @@ gem 'sidekiq', '2.10.0'
# Configuration # Configuration
gem 'configurate', '0.0.2' gem 'configurate', '0.0.6'
# Cross-origin resource sharing # Cross-origin resource sharing

4
Gemfile.lock
View file

@ -76,7 +76,7 @@ GEM
sass (~> 3.1) sass (~> 3.1)
compass-rails (1.0.3) compass-rails (1.0.3)
compass (>= 0.12.2, < 0.14) compass (>= 0.12.2, < 0.14)
configurate (0.0.2) configurate (0.0.6)
connection_pool (1.0.0) connection_pool (1.0.0)
crack (0.3.2) crack (0.3.2)
cucumber (1.2.5) cucumber (1.2.5)
@ -419,7 +419,7 @@ DEPENDENCIES
carrierwave (= 0.8.0) carrierwave (= 0.8.0)
client_side_validations (= 3.2.5) client_side_validations (= 3.2.5)
compass-rails (= 1.0.3) compass-rails (= 1.0.3)
configurate (= 0.0.2) configurate (= 0.0.6)
cucumber-rails (= 1.3.1) cucumber-rails (= 1.3.1)
database_cleaner (= 0.9.1) database_cleaner (= 0.9.1)
devise (= 2.1.3) devise (= 2.1.3)

2
config/load_config.rb
View file

@ -40,7 +40,7 @@ AppConfig ||= Configurate::Settings.create do
extend Configuration::Methods extend Configuration::Methods
if rails_env == "production" && if rails_env == "production" &&
(environment.certificate_authorities.nil? || (environment.certificate_authorities.nil? ||
environment.certificate_authorities.empty? || environment.certificate_authorities.empty? ||
!File.file?(environment.certificate_authorities.get)) !File.file?(environment.certificate_authorities.get))