Permalink
Browse files

bump Rails versions

  • Loading branch information...
1 parent 2779c47 commit f30a5415e6b4969c62454eef3d78f66af6d07850 @mislav committed Jan 10, 2013
Showing with 42 additions and 41 deletions.
  1. +2 −0 Gemfile.rails-edge
  2. +5 −1 Gemfile.rails-edge.lock
  3. +0 −1 Gemfile.rails3.0
  4. +12 −16 Gemfile.rails3.0.lock
  5. +23 −23 Gemfile.rails3.1.lock
View
@@ -6,6 +6,8 @@ gem 'journey', :github => 'rails/journey', :branch => 'master'
gem 'activerecord', :github => 'rails/rails', :branch => 'master'
gem 'actionpack', :github => 'rails/rails', :branch => 'master'
+gem 'thread_safe'
+
gem 'rake'
gem 'rspec', '~> 2.6.0'
gem 'mocha', '~> 0.9.8'
View
@@ -14,7 +14,7 @@ GIT
GIT
remote: git://github.com/rails/rails.git
- revision: 36ee5802a5e52e0720eaa80fd0473fd131ffe890
+ revision: 8d926f58d91020f9a8936ad6908939c0e298907b
branch: master
specs:
actionpack (4.0.0.beta)
@@ -44,6 +44,7 @@ GEM
addressable (2.2.6)
archive-tar-minitar (0.5.2)
arel (3.0.2)
+ atomic (1.0.1)
builder (3.1.4)
columnize (0.3.5)
data_objects (0.10.7)
@@ -108,6 +109,8 @@ GEM
archive-tar-minitar (>= 0.5.2)
sequel (3.30.0)
sqlite3 (1.3.6)
+ thread_safe (0.1.0)
+ atomic
tzinfo (0.3.35)
PLATFORMS
@@ -132,3 +135,4 @@ DEPENDENCIES
ruby-debug19
sequel (~> 3.8)
sqlite3 (~> 1.3.3)
+ thread_safe
View
@@ -3,7 +3,6 @@ source 'http://rubygems.org'
rails_version = '~> 3.0.0'
gem 'activerecord', rails_version
-gem 'activeresource', rails_version
gem 'actionpack', rails_version
gem 'rake'
View
@@ -2,29 +2,26 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionpack (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
+ actionpack (3.0.19)
+ activemodel (= 3.0.19)
+ activesupport (= 3.0.19)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
- rack (~> 1.2.1)
+ rack (~> 1.2.5)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.10)
- activesupport (= 3.0.10)
+ activemodel (3.0.19)
+ activesupport (= 3.0.19)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
+ activerecord (3.0.19)
+ activemodel (= 3.0.19)
+ activesupport (= 3.0.19)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
- activeresource (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- activesupport (3.0.10)
+ activesupport (3.0.19)
archive-tar-minitar (0.5.2)
arel (2.0.10)
builder (2.1.2)
@@ -40,7 +37,7 @@ GEM
mocha (0.9.12)
mysql (2.8.1)
pg (0.11.0)
- rack (1.2.3)
+ rack (1.2.6)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
@@ -71,15 +68,14 @@ GEM
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
sqlite3 (1.3.4)
- tzinfo (0.3.29)
+ tzinfo (0.3.35)
PLATFORMS
ruby
DEPENDENCIES
actionpack (~> 3.0.0)
activerecord (~> 3.0.0)
- activeresource (~> 3.0.0)
mocha (~> 0.9.8)
mysql (~> 2.8.1)
pg (~> 0.11)
View
@@ -1,32 +1,32 @@
GEM
remote: http://rubygems.org/
specs:
- actionpack (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
+ actionpack (3.1.10)
+ activemodel (= 3.1.10)
+ activesupport (= 3.1.10)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.5)
- rack-cache (~> 1.1)
+ rack (~> 1.3.6)
+ rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ sprockets (~> 2.0.4)
+ activemodel (3.1.10)
+ activesupport (= 3.1.10)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.1.10)
+ activemodel (= 3.1.10)
+ activesupport (= 3.1.10)
+ arel (~> 2.2.3)
tzinfo (~> 0.3.29)
- activesupport (3.1.3)
- multi_json (~> 1.0)
+ activesupport (3.1.10)
+ multi_json (>= 1.0, < 1.3)
addressable (2.2.6)
archive-tar-minitar (0.5.2)
- arel (2.2.1)
- builder (3.0.0)
+ arel (2.2.3)
+ builder (3.0.4)
columnize (0.3.6)
data_objects (0.10.7)
addressable (~> 2.1)
@@ -47,23 +47,23 @@ GEM
data_objects (= 0.10.7)
erubis (2.7.0)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
linecache (0.46)
rbx-require-relative (> 0.0.4)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mocha (0.9.12)
- multi_json (1.0.4)
+ multi_json (1.2.0)
mysql (2.8.1)
mysql2 (0.3.11)
pg (0.12.0)
rake-compiler (~> 0.7)
- rack (1.3.5)
- rack-cache (1.1)
+ rack (1.3.8)
+ rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
rake (0.9.2.2)
rake-compiler (0.7.9)
@@ -93,13 +93,13 @@ GEM
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
sequel (3.30.0)
- sprockets (2.0.3)
+ sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
tilt (1.3.3)
- tzinfo (0.3.31)
+ tzinfo (0.3.35)
PLATFORMS
ruby

0 comments on commit f30a541

Please sign in to comment.