Merge pull request #103 from codeinvain/master

fixed "db_name must be a string or symbol" error on rake errbit:bootstrap

Merge pull request #103 from codeinvain/master
fixed "db_name must be a string or symbol" error on rake errbit:bootstrap
Nathan B
2 parents 877ed9e7 389cba43
Showing 2 changed files with 6 additions and 3 deletions Show diff stats
Gemfile.lock
config/environment.rb
@@ -64,7 +64,7 @@ GEM
     faraday (0.7.4)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     faraday_middleware (0.7.0)
       faraday (~> 0.7.3)
     haml (3.1.3)
@@ -203,7 +203,7 @@ GEM
     warden (1.0.5)
       rack (>= 1.0)
     webmock (1.7.6)
-      addressable (> 2.2.5, ~> 2.2)
+      addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
     will_paginate (3.0.2)
  
 # Load the rails application
 require File.expand_path('../application', __FILE__)
-
+if RUBY_VERSION >'1.9'
+  require 'yaml' 
+  YAML::ENGINE.yamler= 'syck'
+end
 # Initialize the rails application
 Errbit::Application.initialize!
...	...	@@ -64,7 +64,7 @@ GEM
64	64	faraday (0.7.4)
65	65	addressable (~> 2.2.6)
66	66	multipart-post (~> 1.1.0)
67		- rack (< 2, >= 1.1.0)
	67	+ rack (>= 1.1.0, < 2)
68	68	faraday_middleware (0.7.0)
69	69	faraday (~> 0.7.3)
70	70	haml (3.1.3)
...	...	@@ -203,7 +203,7 @@ GEM
203	203	warden (1.0.5)
204	204	rack (>= 1.0)
205	205	webmock (1.7.6)
206		- addressable (> 2.2.5, ~> 2.2)
	206	+ addressable (~> 2.2, > 2.2.5)
207	207	crack (>= 0.1.7)
208	208	will_paginate (3.0.2)
209	209
...	...
1	1	# Load the rails application
2	2	require File.expand_path('../application', __FILE__)
3		-
	3	+if RUBY_VERSION >'1.9'
	4	+ require 'yaml'
	5	+ YAML::ENGINE.yamler= 'syck'
	6	+end
4	7	# Initialize the rails application
5	8	Errbit::Application.initialize!
6	9
...	...