Skip to content

Commit 6f6e4ef

Browse files
committed
update rails
1 parent be3bdc7 commit 6f6e4ef

File tree

1 file changed

+45
-47
lines changed

1 file changed

+45
-47
lines changed

Gemfile.lock

+45-47
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,38 @@ GIT
1212
GEM
1313
remote: https://rubygems.org/
1414
specs:
15-
actionmailer (4.2.9)
16-
actionpack (= 4.2.9)
17-
actionview (= 4.2.9)
18-
activejob (= 4.2.9)
15+
actionmailer (4.2.11.3)
16+
actionpack (= 4.2.11.3)
17+
actionview (= 4.2.11.3)
18+
activejob (= 4.2.11.3)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 1.0, >= 1.0.5)
21-
actionpack (4.2.9)
22-
actionview (= 4.2.9)
23-
activesupport (= 4.2.9)
21+
actionpack (4.2.11.3)
22+
actionview (= 4.2.11.3)
23+
activesupport (= 4.2.11.3)
2424
rack (~> 1.6)
2525
rack-test (~> 0.6.2)
2626
rails-dom-testing (~> 1.0, >= 1.0.5)
2727
rails-html-sanitizer (~> 1.0, >= 1.0.2)
2828
actionpack-page_caching (1.1.0)
2929
actionpack (>= 4.0.0, < 6)
30-
actionview (4.2.9)
31-
activesupport (= 4.2.9)
30+
actionview (4.2.11.3)
31+
activesupport (= 4.2.11.3)
3232
builder (~> 3.1)
3333
erubis (~> 2.7.0)
3434
rails-dom-testing (~> 1.0, >= 1.0.5)
3535
rails-html-sanitizer (~> 1.0, >= 1.0.3)
36-
activejob (4.2.9)
37-
activesupport (= 4.2.9)
36+
activejob (4.2.11.3)
37+
activesupport (= 4.2.11.3)
3838
globalid (>= 0.3.0)
39-
activemodel (4.2.9)
40-
activesupport (= 4.2.9)
39+
activemodel (4.2.11.3)
40+
activesupport (= 4.2.11.3)
4141
builder (~> 3.1)
42-
activerecord (4.2.9)
43-
activemodel (= 4.2.9)
44-
activesupport (= 4.2.9)
42+
activerecord (4.2.11.3)
43+
activemodel (= 4.2.11.3)
44+
activesupport (= 4.2.11.3)
4545
arel (~> 6.0)
46-
activesupport (4.2.9)
46+
activesupport (4.2.11.3)
4747
i18n (~> 0.7)
4848
minitest (~> 5.1)
4949
thread_safe (~> 0.3, >= 0.3.4)
@@ -70,7 +70,7 @@ GEM
7070
aws-sigv4 (1.2.2)
7171
aws-eventstream (~> 1, >= 1.0.2)
7272
bigdecimal (1.4.4)
73-
builder (3.2.3)
73+
builder (3.2.4)
7474
capistrano (3.13.0)
7575
airbrussh (>= 1.0.0)
7676
i18n
@@ -111,14 +111,14 @@ GEM
111111
sass (>= 3.3.0, < 3.5)
112112
compass-import-once (1.0.5)
113113
sass (>= 3.2, < 3.5)
114-
concurrent-ruby (1.1.5)
115-
crass (1.0.5)
114+
concurrent-ruby (1.1.7)
115+
crass (1.0.6)
116116
erubis (2.7.0)
117117
execjs (2.7.0)
118118
faraday (0.12.1)
119119
multipart-post (>= 1.2, < 3)
120120
ffi (1.9.18)
121-
globalid (0.4.0)
121+
globalid (0.4.2)
122122
activesupport (>= 4.2.0)
123123
i18n (0.9.5)
124124
concurrent-ruby (~> 1.0)
@@ -133,50 +133,48 @@ GEM
133133
addressable
134134
faraday
135135
json (>= 1.8)
136-
loofah (2.3.1)
136+
loofah (2.7.0)
137137
crass (~> 1.0.2)
138138
nokogiri (>= 1.5.9)
139-
mail (2.6.6)
140-
mime-types (>= 1.16, < 4)
141-
mime-types (3.1)
142-
mime-types-data (~> 3.2015)
143-
mime-types-data (3.2016.0521)
139+
mail (2.7.1)
140+
mini_mime (>= 0.1.1)
141+
mini_mime (1.0.2)
144142
mini_portile2 (2.4.0)
145-
minitest (5.10.2)
143+
minitest (5.14.2)
146144
multi_json (1.12.1)
147145
multipart-post (2.0.0)
148146
mysql2 (0.5.3)
149147
net-scp (3.0.0)
150148
net-ssh (>= 2.6.5, < 7.0.0)
151149
net-ssh (6.1.0)
152-
nokogiri (1.10.5)
150+
nokogiri (1.10.10)
153151
mini_portile2 (~> 2.4.0)
154152
public_suffix (2.0.5)
155-
rack (1.6.11)
153+
rack (1.6.13)
156154
rack-test (0.6.3)
157155
rack (>= 1.0)
158-
rails (4.2.9)
159-
actionmailer (= 4.2.9)
160-
actionpack (= 4.2.9)
161-
actionview (= 4.2.9)
162-
activejob (= 4.2.9)
163-
activemodel (= 4.2.9)
164-
activerecord (= 4.2.9)
165-
activesupport (= 4.2.9)
156+
rails (4.2.11.3)
157+
actionmailer (= 4.2.11.3)
158+
actionpack (= 4.2.11.3)
159+
actionview (= 4.2.11.3)
160+
activejob (= 4.2.11.3)
161+
activemodel (= 4.2.11.3)
162+
activerecord (= 4.2.11.3)
163+
activesupport (= 4.2.11.3)
166164
bundler (>= 1.3.0, < 2.0)
167-
railties (= 4.2.9)
165+
railties (= 4.2.11.3)
168166
sprockets-rails
169167
rails-deprecated_sanitizer (1.0.3)
170168
activesupport (>= 4.2.0.alpha)
171-
rails-dom-testing (1.0.8)
172-
activesupport (>= 4.2.0.beta, < 5.0)
169+
rails-dom-testing (1.0.9)
170+
activesupport (>= 4.2.0, < 5.0)
173171
nokogiri (~> 1.6)
174172
rails-deprecated_sanitizer (>= 1.0.1)
175173
rails-html-sanitizer (1.3.0)
176174
loofah (~> 2.3)
177-
railties (4.2.9)
178-
actionpack (= 4.2.9)
179-
activesupport (= 4.2.9)
175+
railties (4.2.11.3)
176+
actionpack (= 4.2.11.3)
177+
activesupport (= 4.2.11.3)
180178
rake (>= 0.8.7)
181179
thor (>= 0.18.1, < 2.0)
182180
raindrops (0.19.1)
@@ -194,7 +192,7 @@ GEM
194192
sprockets (3.7.2)
195193
concurrent-ruby (~> 1.0)
196194
rack (> 1, < 3)
197-
sprockets-rails (3.2.0)
195+
sprockets-rails (3.2.2)
198196
actionpack (>= 4.0)
199197
activesupport (>= 4.0)
200198
sprockets (>= 3.0.0)
@@ -203,12 +201,12 @@ GEM
203201
net-ssh (>= 2.8.0)
204202
terminal-table (2.0.0)
205203
unicode-display_width (~> 1.1, >= 1.1.1)
206-
thor (0.19.4)
204+
thor (1.0.1)
207205
thread_safe (0.3.6)
208206
tilt (2.0.7)
209207
turn (0.9.6)
210208
ansi
211-
tzinfo (1.2.3)
209+
tzinfo (1.2.7)
212210
thread_safe (~> 0.1)
213211
uglifier (3.2.0)
214212
execjs (>= 0.3.0, < 3)

0 commit comments

Comments
 (0)