Skip to content

Commit 8a2f578

Browse files
committed
Updated for Rails 4.0.0 rc2.
1 parent 48f1255 commit 8a2f578

File tree

2 files changed

+37
-39
lines changed

2 files changed

+37
-39
lines changed

part-1/Gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
source 'https://rubygems.org'
22

33
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4-
gem 'rails', '4.0.0.rc1'
4+
gem 'rails', '4.0.0.rc2'
55

66
gem 'pg'
77

88
# Gems used only for assets and not required
99
# in production environments by default.
1010
group :assets do
11-
gem 'sass-rails', '~> 4.0.0.rc1'
12-
gem 'coffee-rails', '~> 4.0.0.rc1'
11+
gem 'sass-rails', '~> 4.0.0.rc2'
12+
gem 'coffee-rails', '~> 4.0.0.rc2'
1313
gem 'bootstrap-sass', '~> 2.3.1.0'
1414

1515
# See https://github.com/sstephenson/execjs#readme for more supported runtimes

part-1/Gemfile.lock

+34-36
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.0.0.rc1)
5-
actionpack (= 4.0.0.rc1)
4+
actionmailer (4.0.0.rc2)
5+
actionpack (= 4.0.0.rc2)
66
mail (~> 2.5.3)
7-
actionpack (4.0.0.rc1)
8-
activesupport (= 4.0.0.rc1)
7+
actionpack (4.0.0.rc2)
8+
activesupport (= 4.0.0.rc2)
99
builder (~> 3.1.0)
1010
erubis (~> 2.7.0)
1111
rack (~> 1.5.2)
1212
rack-test (~> 0.6.2)
13-
activemodel (4.0.0.rc1)
14-
activesupport (= 4.0.0.rc1)
13+
activemodel (4.0.0.rc2)
14+
activesupport (= 4.0.0.rc2)
1515
builder (~> 3.1.0)
16-
activerecord (4.0.0.rc1)
17-
activemodel (= 4.0.0.rc1)
16+
activerecord (4.0.0.rc2)
17+
activemodel (= 4.0.0.rc2)
1818
activerecord-deprecated_finders (~> 1.0.2)
19-
activesupport (= 4.0.0.rc1)
19+
activesupport (= 4.0.0.rc2)
2020
arel (~> 4.0.0)
21-
activerecord-deprecated_finders (1.0.2)
22-
activesupport (4.0.0.rc1)
21+
activerecord-deprecated_finders (1.0.3)
22+
activesupport (4.0.0.rc2)
2323
i18n (~> 0.6, >= 0.6.4)
2424
minitest (~> 4.2)
2525
multi_json (~> 1.3)
2626
thread_safe (~> 0.1)
2727
tzinfo (~> 0.3.37)
2828
arel (4.0.0)
29-
atomic (1.1.8)
29+
atomic (1.1.9)
3030
bootstrap-sass (2.3.1.0)
3131
sass (~> 3.2)
3232
builder (3.1.4)
@@ -40,59 +40,57 @@ GEM
4040
erubis (2.7.0)
4141
execjs (1.4.0)
4242
multi_json (~> 1.0)
43-
hike (1.2.2)
43+
hike (1.2.3)
4444
i18n (0.6.4)
4545
jbuilder (1.0.2)
4646
activesupport (>= 3.0.0)
4747
jquery-rails (2.2.1)
4848
railties (>= 3.0, < 5.0)
4949
thor (>= 0.14, < 2.0)
50-
mail (2.5.3)
51-
i18n (>= 0.4.0)
50+
mail (2.5.4)
5251
mime-types (~> 1.16)
5352
treetop (~> 1.4.8)
5453
mime-types (1.23)
5554
minitest (4.7.4)
56-
multi_json (1.7.2)
55+
multi_json (1.7.7)
5756
pg (0.15.1)
5857
polyglot (0.3.3)
5958
rack (1.5.2)
6059
rack-test (0.6.2)
6160
rack (>= 1.0)
62-
rails (4.0.0.rc1)
63-
actionmailer (= 4.0.0.rc1)
64-
actionpack (= 4.0.0.rc1)
65-
activerecord (= 4.0.0.rc1)
66-
activesupport (= 4.0.0.rc1)
61+
rails (4.0.0.rc2)
62+
actionmailer (= 4.0.0.rc2)
63+
actionpack (= 4.0.0.rc2)
64+
activerecord (= 4.0.0.rc2)
65+
activesupport (= 4.0.0.rc2)
6766
bundler (>= 1.3.0, < 2.0)
68-
railties (= 4.0.0.rc1)
69-
sprockets-rails (~> 2.0.0.rc4)
70-
railties (4.0.0.rc1)
71-
actionpack (= 4.0.0.rc1)
72-
activesupport (= 4.0.0.rc1)
67+
railties (= 4.0.0.rc2)
68+
sprockets-rails (~> 2.0.0)
69+
railties (4.0.0.rc2)
70+
actionpack (= 4.0.0.rc2)
71+
activesupport (= 4.0.0.rc2)
7372
rake (>= 0.8.7)
7473
thor (>= 0.18.1, < 2.0)
7574
rake (10.0.4)
7675
sass (3.2.8)
77-
sass-rails (4.0.0.rc1)
76+
sass-rails (4.0.0.rc2)
7877
railties (>= 4.0.0.beta, < 5.0)
7978
sass (>= 3.1.10)
80-
sprockets-rails (~> 2.0.0.rc0)
81-
tilt (~> 1.3)
82-
sprockets (2.9.3)
79+
sprockets-rails (~> 2.0.0)
80+
sprockets (2.10.0)
8381
hike (~> 1.2)
8482
multi_json (~> 1.0)
8583
rack (~> 1.0)
8684
tilt (~> 1.1, != 1.3.0)
87-
sprockets-rails (2.0.0.rc4)
85+
sprockets-rails (2.0.0)
8886
actionpack (>= 3.0)
8987
activesupport (>= 3.0)
9088
sprockets (~> 2.8)
9189
thor (0.18.1)
9290
thread_safe (0.1.0)
9391
atomic
94-
tilt (1.4.0)
95-
treetop (1.4.12)
92+
tilt (1.4.1)
93+
treetop (1.4.14)
9694
polyglot
9795
polyglot (>= 0.3.1)
9896
turbolinks (1.1.1)
@@ -107,11 +105,11 @@ PLATFORMS
107105

108106
DEPENDENCIES
109107
bootstrap-sass (~> 2.3.1.0)
110-
coffee-rails (~> 4.0.0.rc1)
108+
coffee-rails (~> 4.0.0.rc2)
111109
jbuilder (~> 1.0.1)
112110
jquery-rails
113111
pg
114-
rails (= 4.0.0.rc1)
115-
sass-rails (~> 4.0.0.rc1)
112+
rails (= 4.0.0.rc2)
113+
sass-rails (~> 4.0.0.rc2)
116114
turbolinks
117115
uglifier (>= 1.0.3)

0 commit comments

Comments
 (0)