Skip to content

Commit 77e154f

Browse files
committed
update appraisals - most importantly rails 4.1 (master)
1 parent 5f773a7 commit 77e154f

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ gem 'mocha', '~> 0.13.1', :require => nil, :group => :test
2626

2727
gem 'simplecov', :require => nil, :group => :test
2828
gem 'bcrypt-ruby', '~> 3.0.0', :require => nil, :group => :test
29+
#gem 'trinidad_dbpool', :require => nil, :group => :test
2930

3031
group :rails do
3132
gem 'erubis', :require => nil

gemfiles/rails23.gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ GEM
2929
activeresource (= 2.3.18)
3030
activesupport (= 2.3.18)
3131
rake (>= 0.8.3)
32-
rake (10.1.0)
32+
rake (10.1.1)
3333
simplecov (0.8.2)
3434
docile (~> 1.1.0)
3535
multi_json

gemfiles/rails32.gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ GEM
2525
mocha (0.13.3)
2626
metaclass (~> 0.0.1)
2727
multi_json (1.8.2)
28-
rake (10.1.0)
28+
rake (10.1.1)
2929
simplecov (0.8.2)
3030
docile (~> 1.1.0)
3131
multi_json

gemfiles/rails40.gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ GEM
3030
mocha (0.13.3)
3131
metaclass (~> 0.0.1)
3232
multi_json (1.8.2)
33-
rake (10.1.0)
33+
rake (10.1.1)
3434
simplecov (0.8.2)
3535
docile (~> 1.1.0)
3636
multi_json

gemfiles/rails41.gemfile.lock

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: git://github.com/rails/rails.git
3-
revision: 3968870d31dc5ab272b5e77904c45183227696be
3+
revision: 892c539591c001285792b7865fe5d70846b0041b
44
branch: master
55
specs:
66
actionmailer (4.1.0.beta1)
@@ -52,13 +52,16 @@ GEM
5252
bundler
5353
rake
5454
arel (5.0.0)
55+
atomic (1.1.14)
5556
atomic (1.1.14-java)
57+
bcrypt-ruby (3.0.1)
5658
bcrypt-ruby (3.0.1-java)
5759
builder (3.1.4)
5860
docile (1.1.1)
5961
erubis (2.7.0)
6062
hike (1.2.3)
6163
i18n (0.6.9)
64+
json (1.8.1)
6265
json (1.8.1-java)
6366
mail (2.5.4)
6467
mime-types (~> 1.16)
@@ -69,11 +72,13 @@ GEM
6972
mocha (0.13.3)
7073
metaclass (~> 0.0.1)
7174
multi_json (1.8.2)
75+
mysql2 (0.3.14)
76+
pg (0.17.1)
7277
polyglot (0.3.3)
7378
rack (1.5.2)
7479
rack-test (0.6.2)
7580
rack (>= 1.0)
76-
rake (10.1.0)
81+
rake (10.1.1)
7782
simplecov (0.8.2)
7883
docile (~> 1.1.0)
7984
multi_json
@@ -88,10 +93,13 @@ GEM
8893
actionpack (>= 3.0)
8994
activesupport (>= 3.0)
9095
sprockets (~> 2.8)
96+
sqlite3 (1.3.8)
9197
test-unit (2.5.4)
9298
test-unit-context (0.3.1)
9399
test-unit (>= 2.4.0)
94100
thor (0.18.1)
101+
thread_safe (0.1.3)
102+
atomic
95103
thread_safe (0.1.3-java)
96104
atomic
97105
tilt (1.4.1)
@@ -103,6 +111,7 @@ GEM
103111

104112
PLATFORMS
105113
java
114+
ruby
106115

107116
DEPENDENCIES
108117
activerecord!

0 commit comments

Comments
 (0)