Permalink
Browse files

Bundle update

  • Loading branch information...
1 parent aa599f9 commit 5e120038042d6fac55f32662f34382b145a3a5f5 @joelmoss joelmoss committed Mar 25, 2013
Showing with 53 additions and 52 deletions.
  1. +2 −2 Gemfile
  2. +50 −49 Gemfile.lock
  3. +1 −1 test/test_helper.rb
View
@@ -1,7 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
gemspec
-gem 'rails', '~> 3.1'
+gem 'rails', '~> 3.2'
gem 'mocha'
gem 'turn'
View
@@ -6,99 +6,100 @@ PATH
responders (~> 0.9)
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- actionmailer (3.2.6)
- actionpack (= 3.2.6)
- mail (~> 2.4.4)
- actionpack (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
- rack (~> 1.4.0)
+ journey (~> 1.0.4)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.6)
- activesupport (= 3.2.6)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
- activesupport (3.2.6)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
ansi (1.4.3)
arel (3.0.2)
- builder (3.0.0)
+ builder (3.0.4)
erubis (2.7.0)
has_scope (0.5.1)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
- json (1.7.3)
- mail (2.4.4)
+ json (1.7.7)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.19)
- mocha (0.12.0)
+ mime-types (1.21)
+ mocha (0.13.3)
metaclass (~> 0.0.1)
- multi_json (1.3.6)
+ multi_json (1.7.2)
polyglot (0.3.3)
- rack (1.4.1)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.6)
- actionmailer (= 3.2.6)
- actionpack (= 3.2.6)
- activerecord (= 3.2.6)
- activeresource (= 3.2.6)
- activesupport (= 3.2.6)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.6)
- railties (3.2.6)
- actionpack (= 3.2.6)
- activesupport (= 3.2.6)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
- rdoc (3.12)
+ rake (10.0.4)
+ rdoc (3.12.2)
json (~> 1.4)
- responders (0.9.1)
+ responders (0.9.3)
railties (~> 3.1)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- thor (0.15.4)
- tilt (1.3.3)
- treetop (1.4.10)
+ thor (0.17.0)
+ tilt (1.3.6)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
turn (0.9.6)
ansi
- tzinfo (0.3.33)
+ tzinfo (0.3.37)
PLATFORMS
ruby
DEPENDENCIES
inherited_resources!
mocha
- rails (~> 3.1)
+ rails (~> 3.2)
turn
View
@@ -4,7 +4,7 @@
Bundler.setup
require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
begin; require 'turn/autorun'; rescue LoadError; end
ENV["RAILS_ENV"] = "test"

0 comments on commit 5e12003

Please sign in to comment.