Update gems
This commit is contained in:
		
							parent
							
								
									69a8fce64a
								
							
						
					
					
						commit
						227ca0d43a
					
				
							
								
								
									
										117
									
								
								Gemfile.lock
								
								
								
								
							
							
						
						
									
										117
									
								
								Gemfile.lock
								
								
								
								
							| 
						 | 
				
			
			@ -1,43 +1,43 @@
 | 
			
		|||
GEM
 | 
			
		||||
  remote: http://rubygems.org/
 | 
			
		||||
  specs:
 | 
			
		||||
    actionmailer (3.1.1)
 | 
			
		||||
      actionpack (= 3.1.1)
 | 
			
		||||
    actionmailer (3.1.3)
 | 
			
		||||
      actionpack (= 3.1.3)
 | 
			
		||||
      mail (~> 2.3.0)
 | 
			
		||||
    actionpack (3.1.1)
 | 
			
		||||
      activemodel (= 3.1.1)
 | 
			
		||||
      activesupport (= 3.1.1)
 | 
			
		||||
    actionpack (3.1.3)
 | 
			
		||||
      activemodel (= 3.1.3)
 | 
			
		||||
      activesupport (= 3.1.3)
 | 
			
		||||
      builder (~> 3.0.0)
 | 
			
		||||
      erubis (~> 2.7.0)
 | 
			
		||||
      i18n (~> 0.6)
 | 
			
		||||
      rack (~> 1.3.2)
 | 
			
		||||
      rack (~> 1.3.5)
 | 
			
		||||
      rack-cache (~> 1.1)
 | 
			
		||||
      rack-mount (~> 0.8.2)
 | 
			
		||||
      rack-test (~> 0.6.1)
 | 
			
		||||
      sprockets (~> 2.0.2)
 | 
			
		||||
    activemodel (3.1.1)
 | 
			
		||||
      activesupport (= 3.1.1)
 | 
			
		||||
      sprockets (~> 2.0.3)
 | 
			
		||||
    activemodel (3.1.3)
 | 
			
		||||
      activesupport (= 3.1.3)
 | 
			
		||||
      builder (~> 3.0.0)
 | 
			
		||||
      i18n (~> 0.6)
 | 
			
		||||
    activerecord (3.1.1)
 | 
			
		||||
      activemodel (= 3.1.1)
 | 
			
		||||
      activesupport (= 3.1.1)
 | 
			
		||||
    activerecord (3.1.3)
 | 
			
		||||
      activemodel (= 3.1.3)
 | 
			
		||||
      activesupport (= 3.1.3)
 | 
			
		||||
      arel (~> 2.2.1)
 | 
			
		||||
      tzinfo (~> 0.3.29)
 | 
			
		||||
    activeresource (3.1.1)
 | 
			
		||||
      activemodel (= 3.1.1)
 | 
			
		||||
      activesupport (= 3.1.1)
 | 
			
		||||
    activesupport (3.1.1)
 | 
			
		||||
    activeresource (3.1.3)
 | 
			
		||||
      activemodel (= 3.1.3)
 | 
			
		||||
      activesupport (= 3.1.3)
 | 
			
		||||
    activesupport (3.1.3)
 | 
			
		||||
      multi_json (~> 1.0)
 | 
			
		||||
    archive-tar-minitar (0.5.2)
 | 
			
		||||
    arel (2.2.1)
 | 
			
		||||
    bcrypt-ruby (3.0.1)
 | 
			
		||||
    bson (1.4.1)
 | 
			
		||||
    bson_ext (1.4.1)
 | 
			
		||||
    bson (1.5.1)
 | 
			
		||||
    bson_ext (1.5.1)
 | 
			
		||||
    builder (3.0.0)
 | 
			
		||||
    carrierwave (0.5.4)
 | 
			
		||||
      activesupport (~> 3.0)
 | 
			
		||||
    chronic (0.6.4)
 | 
			
		||||
    chronic (0.6.6)
 | 
			
		||||
    ckeditor (3.6.3)
 | 
			
		||||
      mime-types (~> 1.16)
 | 
			
		||||
      orm_adapter (~> 0.0.5)
 | 
			
		||||
| 
						 | 
				
			
			@ -47,48 +47,48 @@ GEM
 | 
			
		|||
    coffee-script (2.2.0)
 | 
			
		||||
      coffee-script-source
 | 
			
		||||
      execjs
 | 
			
		||||
    coffee-script-source (1.1.2)
 | 
			
		||||
    columnize (0.3.4)
 | 
			
		||||
    delorean (1.1.0)
 | 
			
		||||
    coffee-script-source (1.1.3)
 | 
			
		||||
    columnize (0.3.5)
 | 
			
		||||
    delorean (1.1.1)
 | 
			
		||||
      chronic
 | 
			
		||||
    devise (1.4.8)
 | 
			
		||||
    devise (1.5.2)
 | 
			
		||||
      bcrypt-ruby (~> 3.0)
 | 
			
		||||
      orm_adapter (~> 0.0.3)
 | 
			
		||||
      warden (~> 1.0.3)
 | 
			
		||||
      warden (~> 1.1)
 | 
			
		||||
    diff-lcs (1.1.3)
 | 
			
		||||
    erubis (2.7.0)
 | 
			
		||||
    execjs (1.2.9)
 | 
			
		||||
      multi_json (~> 1.0)
 | 
			
		||||
    factory_girl (2.2.0)
 | 
			
		||||
    factory_girl (2.3.2)
 | 
			
		||||
      activesupport
 | 
			
		||||
    factory_girl_rails (1.3.0)
 | 
			
		||||
      factory_girl (~> 2.2.0)
 | 
			
		||||
    factory_girl_rails (1.4.0)
 | 
			
		||||
      factory_girl (~> 2.3.0)
 | 
			
		||||
      railties (>= 3.0.0)
 | 
			
		||||
    hike (1.2.1)
 | 
			
		||||
    i18n (0.6.0)
 | 
			
		||||
    jquery-rails (1.0.16)
 | 
			
		||||
    jquery-rails (1.0.19)
 | 
			
		||||
      railties (~> 3.0)
 | 
			
		||||
      thor (~> 0.14)
 | 
			
		||||
    json (1.6.1)
 | 
			
		||||
    json (1.6.3)
 | 
			
		||||
    linecache19 (0.5.12)
 | 
			
		||||
      ruby_core_source (>= 0.1.4)
 | 
			
		||||
    mail (2.3.0)
 | 
			
		||||
      i18n (>= 0.4.0)
 | 
			
		||||
      mime-types (~> 1.16)
 | 
			
		||||
      treetop (~> 1.4.8)
 | 
			
		||||
    mime-types (1.16)
 | 
			
		||||
    mime-types (1.17.2)
 | 
			
		||||
    mini_magick (3.3)
 | 
			
		||||
      subexec (~> 0.1.0)
 | 
			
		||||
    mongo (1.4.1)
 | 
			
		||||
      bson (= 1.4.1)
 | 
			
		||||
    mongoid (2.3.2)
 | 
			
		||||
    mongo (1.5.1)
 | 
			
		||||
      bson (= 1.5.1)
 | 
			
		||||
    mongoid (2.3.4)
 | 
			
		||||
      activemodel (~> 3.1)
 | 
			
		||||
      mongo (~> 1.4)
 | 
			
		||||
      mongo (~> 1.3)
 | 
			
		||||
      tzinfo (~> 0.3.22)
 | 
			
		||||
    multi_json (1.0.3)
 | 
			
		||||
    multi_json (1.0.4)
 | 
			
		||||
    orm_adapter (0.0.5)
 | 
			
		||||
    polyglot (0.3.2)
 | 
			
		||||
    rack (1.3.4)
 | 
			
		||||
    polyglot (0.3.3)
 | 
			
		||||
    rack (1.3.5)
 | 
			
		||||
    rack-cache (1.1)
 | 
			
		||||
      rack (>= 0.4)
 | 
			
		||||
    rack-mount (0.8.3)
 | 
			
		||||
| 
						 | 
				
			
			@ -99,22 +99,22 @@ GEM
 | 
			
		|||
      rack
 | 
			
		||||
    rack-test (0.6.1)
 | 
			
		||||
      rack (>= 1.0)
 | 
			
		||||
    rails (3.1.1)
 | 
			
		||||
      actionmailer (= 3.1.1)
 | 
			
		||||
      actionpack (= 3.1.1)
 | 
			
		||||
      activerecord (= 3.1.1)
 | 
			
		||||
      activeresource (= 3.1.1)
 | 
			
		||||
      activesupport (= 3.1.1)
 | 
			
		||||
    rails (3.1.3)
 | 
			
		||||
      actionmailer (= 3.1.3)
 | 
			
		||||
      actionpack (= 3.1.3)
 | 
			
		||||
      activerecord (= 3.1.3)
 | 
			
		||||
      activeresource (= 3.1.3)
 | 
			
		||||
      activesupport (= 3.1.3)
 | 
			
		||||
      bundler (~> 1.0)
 | 
			
		||||
      railties (= 3.1.1)
 | 
			
		||||
    railties (3.1.1)
 | 
			
		||||
      actionpack (= 3.1.1)
 | 
			
		||||
      activesupport (= 3.1.1)
 | 
			
		||||
      railties (= 3.1.3)
 | 
			
		||||
    railties (3.1.3)
 | 
			
		||||
      actionpack (= 3.1.3)
 | 
			
		||||
      activesupport (= 3.1.3)
 | 
			
		||||
      rack-ssl (~> 1.3.2)
 | 
			
		||||
      rake (>= 0.8.7)
 | 
			
		||||
      rdoc (~> 3.4)
 | 
			
		||||
      thor (~> 0.14.6)
 | 
			
		||||
    rake (0.9.2)
 | 
			
		||||
    rake (0.9.2.2)
 | 
			
		||||
    rcov (0.9.11)
 | 
			
		||||
    rdoc (3.11)
 | 
			
		||||
      json (~> 1.4)
 | 
			
		||||
| 
						 | 
				
			
			@ -122,7 +122,7 @@ GEM
 | 
			
		|||
      rspec-core (~> 2.7.0)
 | 
			
		||||
      rspec-expectations (~> 2.7.0)
 | 
			
		||||
      rspec-mocks (~> 2.7.0)
 | 
			
		||||
    rspec-core (2.7.0)
 | 
			
		||||
    rspec-core (2.7.1)
 | 
			
		||||
    rspec-expectations (2.7.0)
 | 
			
		||||
      diff-lcs (~> 1.1.2)
 | 
			
		||||
    rspec-mocks (2.7.0)
 | 
			
		||||
| 
						 | 
				
			
			@ -141,15 +141,14 @@ GEM
 | 
			
		|||
      ruby-debug-base19 (>= 0.11.19)
 | 
			
		||||
    ruby_core_source (0.1.5)
 | 
			
		||||
      archive-tar-minitar (>= 0.5.2)
 | 
			
		||||
    rubyzip (0.9.4)
 | 
			
		||||
    sass (3.1.10)
 | 
			
		||||
    sass-rails (3.1.4)
 | 
			
		||||
    rubyzip (0.9.5)
 | 
			
		||||
    sass (3.1.11)
 | 
			
		||||
    sass-rails (3.1.5)
 | 
			
		||||
      actionpack (~> 3.1.0)
 | 
			
		||||
      railties (~> 3.1.0)
 | 
			
		||||
      sass (>= 3.1.4)
 | 
			
		||||
      sprockets (~> 2.0.0)
 | 
			
		||||
      sass (~> 3.1.10)
 | 
			
		||||
      tilt (~> 1.3.2)
 | 
			
		||||
    shoulda-matchers (1.0.0.beta3)
 | 
			
		||||
    shoulda-matchers (1.0.0)
 | 
			
		||||
    sinatra (1.3.1)
 | 
			
		||||
      rack (~> 1.3, >= 1.3.4)
 | 
			
		||||
      rack-protection (~> 1.1, >= 1.1.2)
 | 
			
		||||
| 
						 | 
				
			
			@ -164,14 +163,14 @@ GEM
 | 
			
		|||
    treetop (1.4.10)
 | 
			
		||||
      polyglot
 | 
			
		||||
      polyglot (>= 0.3.1)
 | 
			
		||||
    tzinfo (0.3.30)
 | 
			
		||||
    uglifier (1.0.3)
 | 
			
		||||
    tzinfo (0.3.31)
 | 
			
		||||
    uglifier (1.1.0)
 | 
			
		||||
      execjs (>= 0.3.0)
 | 
			
		||||
      multi_json (>= 1.0.2)
 | 
			
		||||
    warden (1.0.6)
 | 
			
		||||
    warden (1.1.0)
 | 
			
		||||
      rack (>= 1.0)
 | 
			
		||||
    watchr (0.7)
 | 
			
		||||
    yajl-ruby (1.0.0)
 | 
			
		||||
    yajl-ruby (1.1.0)
 | 
			
		||||
 | 
			
		||||
PLATFORMS
 | 
			
		||||
  ruby
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue