update gem bson_ext and devise initializer
This commit is contained in:
		
							parent
							
								
									4ed6e8090e
								
							
						
					
					
						commit
						d88cae437d
					
				
							
								
								
									
										3
									
								
								Gemfile
								
								
								
								
							
							
						
						
									
										3
									
								
								Gemfile
								
								
								
								
							|  | @ -4,12 +4,11 @@ gem 'rails', '3.0.6' | ||||||
| gem 'yajl-ruby', :require => 'yajl' | gem 'yajl-ruby', :require => 'yajl' | ||||||
| gem 'nokogiri' | gem 'nokogiri' | ||||||
| 
 | 
 | ||||||
| gem 'bson_ext', '1.2.4' | gem 'bson_ext' | ||||||
| gem 'carrierwave' | gem 'carrierwave' | ||||||
| gem 'devise' | gem 'devise' | ||||||
| gem 'mini_magick' | gem 'mini_magick' | ||||||
| 
 | 
 | ||||||
| # gem 'rblog', :path => 'lib/rblog' |  | ||||||
| gem 'mongoid', '2.0.0' | gem 'mongoid', '2.0.0' | ||||||
| 
 | 
 | ||||||
| # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+) | # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+) | ||||||
|  |  | ||||||
|  | @ -31,7 +31,7 @@ GEM | ||||||
|     arel (2.0.9) |     arel (2.0.9) | ||||||
|     bcrypt-ruby (2.1.4) |     bcrypt-ruby (2.1.4) | ||||||
|     bson (1.3.0) |     bson (1.3.0) | ||||||
|     bson_ext (1.2.4) |     bson_ext (1.3.0) | ||||||
|     builder (2.1.2) |     builder (2.1.2) | ||||||
|     carrierwave (0.5.3) |     carrierwave (0.5.3) | ||||||
|       activesupport (~> 3.0) |       activesupport (~> 3.0) | ||||||
|  | @ -117,7 +117,7 @@ PLATFORMS | ||||||
|   ruby |   ruby | ||||||
| 
 | 
 | ||||||
| DEPENDENCIES | DEPENDENCIES | ||||||
|   bson_ext (= 1.2.4) |   bson_ext | ||||||
|   carrierwave |   carrierwave | ||||||
|   delorean |   delorean | ||||||
|   devise |   devise | ||||||
|  |  | ||||||
|  | @ -43,7 +43,7 @@ Devise.setup do |config| | ||||||
|   # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then |   # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then | ||||||
|   # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1 |   # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1 | ||||||
|   # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper) |   # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper) | ||||||
|   config.encryptor = :bcrypt |   # config.encryptor = :bcrypt | ||||||
| 
 | 
 | ||||||
|   # Setup a pepper to generate the encrypted password. |   # Setup a pepper to generate the encrypted password. | ||||||
|   config.pepper = "a5a6b41c8a259f0642f9e8a51b77f3c671be92a430e021e00f7e0bcc71381c0698d3c3e9c1dc270872a16ed2703715e3b3b817245740bbb871a3411714944dce" |   config.pepper = "a5a6b41c8a259f0642f9e8a51b77f3c671be92a430e021e00f7e0bcc71381c0698d3c3e9c1dc270872a16ed2703715e3b3b817245740bbb871a3411714944dce" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue