Skip to content

Commit 9ccad72

Browse files
committed
update to Rails 3.1.3
1 parent 4eea144 commit 9ccad72

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
source 'http://rubygems.org'
2-
gem 'rails', '3.1.2'
2+
gem 'rails', '3.1.3'
33
gem 'sqlite3'
44
group :assets do
5-
gem 'sass-rails', '~> 3.1.5.rc.2'
5+
gem 'sass-rails', '~> 3.1.5'
66
gem 'coffee-rails', '~> 3.1.1'
77
gem 'uglifier', '>= 1.0.3'
88
end

Gemfile.lock

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
actionmailer (3.1.2)
5-
actionpack (= 3.1.2)
4+
actionmailer (3.1.3)
5+
actionpack (= 3.1.3)
66
mail (~> 2.3.0)
7-
actionpack (3.1.2)
8-
activemodel (= 3.1.2)
9-
activesupport (= 3.1.2)
7+
actionpack (3.1.3)
8+
activemodel (= 3.1.3)
9+
activesupport (= 3.1.3)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
i18n (~> 0.6)
1313
rack (~> 1.3.5)
1414
rack-cache (~> 1.1)
1515
rack-mount (~> 0.8.2)
1616
rack-test (~> 0.6.1)
17-
sprockets (~> 2.1.0)
18-
activemodel (3.1.2)
19-
activesupport (= 3.1.2)
17+
sprockets (~> 2.0.3)
18+
activemodel (3.1.3)
19+
activesupport (= 3.1.3)
2020
builder (~> 3.0.0)
2121
i18n (~> 0.6)
22-
activerecord (3.1.2)
23-
activemodel (= 3.1.2)
24-
activesupport (= 3.1.2)
22+
activerecord (3.1.3)
23+
activemodel (= 3.1.3)
24+
activesupport (= 3.1.3)
2525
arel (~> 2.2.1)
2626
tzinfo (~> 0.3.29)
27-
activeresource (3.1.2)
28-
activemodel (= 3.1.2)
29-
activesupport (= 3.1.2)
30-
activesupport (3.1.2)
27+
activeresource (3.1.3)
28+
activemodel (= 3.1.3)
29+
activesupport (= 3.1.3)
30+
activesupport (3.1.3)
3131
multi_json (~> 1.0)
3232
addressable (2.2.6)
3333
arel (2.2.1)
@@ -74,7 +74,7 @@ GEM
7474
factory_girl (~> 2.3.0)
7575
railties (>= 3.0.0)
7676
ffi (1.0.11)
77-
gherkin (2.6.5)
77+
gherkin (2.6.6)
7878
json (>= 1.4.6)
7979
hike (1.2.1)
8080
i18n (0.6.0)
@@ -103,17 +103,17 @@ GEM
103103
rack
104104
rack-test (0.6.1)
105105
rack (>= 1.0)
106-
rails (3.1.2)
107-
actionmailer (= 3.1.2)
108-
actionpack (= 3.1.2)
109-
activerecord (= 3.1.2)
110-
activeresource (= 3.1.2)
111-
activesupport (= 3.1.2)
106+
rails (3.1.3)
107+
actionmailer (= 3.1.3)
108+
actionpack (= 3.1.3)
109+
activerecord (= 3.1.3)
110+
activeresource (= 3.1.3)
111+
activesupport (= 3.1.3)
112112
bundler (~> 1.0)
113-
railties (= 3.1.2)
114-
railties (3.1.2)
115-
actionpack (= 3.1.2)
116-
activesupport (= 3.1.2)
113+
railties (= 3.1.3)
114+
railties (3.1.3)
115+
actionpack (= 3.1.3)
116+
activesupport (= 3.1.3)
117117
rack-ssl (~> 1.3.2)
118118
rake (>= 0.8.7)
119119
rdoc (~> 3.4)
@@ -146,7 +146,7 @@ GEM
146146
ffi (~> 1.0.9)
147147
json_pure
148148
rubyzip
149-
sprockets (2.1.1)
149+
sprockets (2.0.3)
150150
hike (~> 1.2)
151151
rack (~> 1.0)
152152
tilt (~> 1.1, != 1.3.0)
@@ -178,8 +178,8 @@ DEPENDENCIES
178178
factory_girl_rails (>= 1.4.0)
179179
jquery-rails
180180
launchy (>= 2.0.5)
181-
rails (= 3.1.2)
181+
rails (= 3.1.3)
182182
rspec-rails (>= 2.8.0.rc1)
183-
sass-rails (~> 3.1.5.rc.2)
183+
sass-rails (~> 3.1.5)
184184
sqlite3
185185
uglifier (>= 1.0.3)

0 commit comments

Comments
 (0)