Skip to content

Commit 60ae0c4

Browse files
committed
Merge pull request #78 from leesmith/75-upgrade-rails
Update rails to 4.2.3 (closes #75)
2 parents 32845ab + 7b45d9c commit 60ae0c4

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '4.2.1'
3+
gem 'rails', '4.2.3'
44

55
gem 'coffee-rails', '~> 4.1.0'
66
gem 'devise'

Gemfile.lock

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.1)
5-
actionpack (= 4.2.1)
6-
actionview (= 4.2.1)
7-
activejob (= 4.2.1)
4+
actionmailer (4.2.3)
5+
actionpack (= 4.2.3)
6+
actionview (= 4.2.3)
7+
activejob (= 4.2.3)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.1)
11-
actionview (= 4.2.1)
12-
activesupport (= 4.2.1)
10+
actionpack (4.2.3)
11+
actionview (= 4.2.3)
12+
activesupport (= 4.2.3)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
16-
rails-html-sanitizer (~> 1.0, >= 1.0.1)
17-
actionview (4.2.1)
18-
activesupport (= 4.2.1)
16+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17+
actionview (4.2.3)
18+
activesupport (= 4.2.3)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
22-
rails-html-sanitizer (~> 1.0, >= 1.0.1)
23-
activejob (4.2.1)
24-
activesupport (= 4.2.1)
22+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
23+
activejob (4.2.3)
24+
activesupport (= 4.2.3)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.1)
27-
activesupport (= 4.2.1)
26+
activemodel (4.2.3)
27+
activesupport (= 4.2.3)
2828
builder (~> 3.1)
29-
activerecord (4.2.1)
30-
activemodel (= 4.2.1)
31-
activesupport (= 4.2.1)
29+
activerecord (4.2.3)
30+
activemodel (= 4.2.3)
31+
activesupport (= 4.2.3)
3232
arel (~> 6.0)
33-
activesupport (4.2.1)
33+
activesupport (4.2.3)
3434
i18n (~> 0.7)
3535
json (~> 1.7, >= 1.7.7)
3636
minitest (~> 5.1)
3737
thread_safe (~> 0.3, >= 0.3.4)
3838
tzinfo (~> 1.1)
3939
addressable (2.3.8)
40-
arel (6.0.0)
40+
arel (6.0.2)
4141
bcrypt (3.1.9)
4242
binding_of_caller (0.7.2)
4343
debug_inspector (>= 0.0.1)
@@ -111,18 +111,18 @@ GEM
111111
rails-dom-testing (~> 1.0)
112112
railties (>= 4.2.0.beta, < 5.0)
113113
thor (>= 0.14, < 2.0)
114-
json (1.8.2)
114+
json (1.8.3)
115115
launchy (2.4.3)
116116
addressable (~> 2.3)
117-
loofah (2.0.1)
117+
loofah (2.0.2)
118118
nokogiri (>= 1.5.9)
119119
mail (2.6.3)
120120
mime-types (>= 1.16, < 3)
121121
method_source (0.8.2)
122-
mime-types (2.4.3)
122+
mime-types (2.6.1)
123123
mini_portile (0.6.2)
124-
minitest (5.6.0)
125-
multi_json (1.11.0)
124+
minitest (5.7.0)
125+
multi_json (1.11.2)
126126
nokogiri (1.6.6.2)
127127
mini_portile (~> 0.6.0)
128128
orm_adapter (0.5.0)
@@ -151,19 +151,19 @@ GEM
151151
eventmachine_httpserver
152152
http_parser.rb (~> 0.6.0)
153153
multi_json
154-
rack (1.6.0)
154+
rack (1.6.4)
155155
rack-test (0.6.3)
156156
rack (>= 1.0)
157-
rails (4.2.1)
158-
actionmailer (= 4.2.1)
159-
actionpack (= 4.2.1)
160-
actionview (= 4.2.1)
161-
activejob (= 4.2.1)
162-
activemodel (= 4.2.1)
163-
activerecord (= 4.2.1)
164-
activesupport (= 4.2.1)
157+
rails (4.2.3)
158+
actionmailer (= 4.2.3)
159+
actionpack (= 4.2.3)
160+
actionview (= 4.2.3)
161+
activejob (= 4.2.3)
162+
activemodel (= 4.2.3)
163+
activerecord (= 4.2.3)
164+
activesupport (= 4.2.3)
165165
bundler (>= 1.3.0, < 2.0)
166-
railties (= 4.2.1)
166+
railties (= 4.2.3)
167167
sprockets-rails
168168
rails-deprecated_sanitizer (1.0.3)
169169
activesupport (>= 4.2.0.alpha)
@@ -173,9 +173,9 @@ GEM
173173
rails-deprecated_sanitizer (>= 1.0.1)
174174
rails-html-sanitizer (1.0.2)
175175
loofah (~> 2.0)
176-
railties (4.2.1)
177-
actionpack (= 4.2.1)
178-
activesupport (= 4.2.1)
176+
railties (4.2.3)
177+
actionpack (= 4.2.3)
178+
activesupport (= 4.2.3)
179179
rake (>= 0.8.7)
180180
thor (>= 0.18.1, < 2.0)
181181
rake (10.4.2)
@@ -217,12 +217,12 @@ GEM
217217
spring (1.2.0)
218218
spring-commands-rspec (1.0.4)
219219
spring (>= 0.9.1)
220-
sprockets (2.12.3)
220+
sprockets (2.12.4)
221221
hike (~> 1.2)
222222
multi_json (~> 1.0)
223223
rack (~> 1.0)
224224
tilt (~> 1.1, != 1.3.0)
225-
sprockets-rails (2.2.4)
225+
sprockets-rails (2.3.2)
226226
actionpack (>= 3.0)
227227
activesupport (>= 3.0)
228228
sprockets (>= 2.8, < 4.0)
@@ -274,7 +274,7 @@ DEPENDENCIES
274274
pry-rescue
275275
pry-stack_explorer
276276
puffing-billy
277-
rails (= 4.2.1)
277+
rails (= 4.2.3)
278278
rspec-rails (~> 3.2)
279279
sass-rails (~> 4.0)
280280
selenium-webdriver
@@ -289,4 +289,4 @@ DEPENDENCIES
289289
webmock
290290

291291
BUNDLED WITH
292-
1.10.3
292+
1.10.5

0 commit comments

Comments
 (0)