Skip to content

Commit 67e1365

Browse files
authored
Merge pull request #304 from jasnow/master
Upgraded repo to Rails 5.1 along with 7 other gems
2 parents a6eb861 + 3715805 commit 67e1365

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
@@ -2,7 +2,7 @@
22
source "https://rubygems.org"
33

44
#don't upgrade
5-
gem "rails", "5.1.4"
5+
gem "rails", "5.1.5"
66

77
ruby "2.4.3"
88

Gemfile.lock

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.4)
5-
actionpack (= 5.1.4)
4+
actioncable (5.1.5)
5+
actionpack (= 5.1.5)
66
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.4)
9-
actionpack (= 5.1.4)
10-
actionview (= 5.1.4)
11-
activejob (= 5.1.4)
8+
actionmailer (5.1.5)
9+
actionpack (= 5.1.5)
10+
actionview (= 5.1.5)
11+
activejob (= 5.1.5)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.4)
15-
actionview (= 5.1.4)
16-
activesupport (= 5.1.4)
14+
actionpack (5.1.5)
15+
actionview (= 5.1.5)
16+
activesupport (= 5.1.5)
1717
rack (~> 2.0)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.4)
22-
activesupport (= 5.1.4)
21+
actionview (5.1.5)
22+
activesupport (= 5.1.5)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.1.4)
28-
activesupport (= 5.1.4)
27+
activejob (5.1.5)
28+
activesupport (= 5.1.5)
2929
globalid (>= 0.3.6)
30-
activemodel (5.1.4)
31-
activesupport (= 5.1.4)
32-
activerecord (5.1.4)
33-
activemodel (= 5.1.4)
34-
activesupport (= 5.1.4)
30+
activemodel (5.1.5)
31+
activesupport (= 5.1.5)
32+
activerecord (5.1.5)
33+
activemodel (= 5.1.5)
34+
activesupport (= 5.1.5)
3535
arel (~> 8.0)
36-
activesupport (5.1.4)
36+
activesupport (5.1.5)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (~> 0.7)
3939
minitest (~> 5.1)
@@ -62,7 +62,7 @@ GEM
6262
bundler-audit (0.6.0)
6363
bundler (~> 1.2)
6464
thor (~> 0.18)
65-
capybara (2.17.0)
65+
capybara (2.18.0)
6666
addressable
6767
mini_mime (>= 0.1.3)
6868
nokogiri (>= 1.3.3)
@@ -109,7 +109,7 @@ GEM
109109
erubi (1.7.0)
110110
eventmachine (1.2.5)
111111
execjs (2.7.0)
112-
ffi (1.9.18)
112+
ffi (1.9.21)
113113
foreman (0.84.0)
114114
thor (~> 0.19.1)
115115
formatador (0.2.5)
@@ -142,7 +142,7 @@ GEM
142142
guard (>= 2.0.0)
143143
guard-compat (~> 1.0)
144144
http_parser.rb (0.6.0)
145-
i18n (0.9.3)
145+
i18n (0.9.5)
146146
concurrent-ruby (~> 1.0)
147147
jquery-fileupload-rails (0.4.7)
148148
actionpack (>= 3.1)
@@ -161,7 +161,7 @@ GEM
161161
rb-fsevent (~> 0.9, >= 0.9.4)
162162
rb-inotify (~> 0.9, >= 0.9.7)
163163
ruby_dep (~> 1.2)
164-
loofah (2.1.1)
164+
loofah (2.2.0)
165165
crass (~> 1.0.2)
166166
nokogiri (>= 1.5.9)
167167
lumberjack (1.0.12)
@@ -182,8 +182,8 @@ GEM
182182
nenv (~> 0.1)
183183
shellany (~> 0.0)
184184
parallel (1.12.1)
185-
parser (2.4.0.2)
186-
ast (~> 2.3)
185+
parser (2.5.0.0)
186+
ast (~> 2.4.0)
187187
poltergeist (1.17.0)
188188
capybara (~> 2.1)
189189
cliver (~> 0.3.1)
@@ -197,33 +197,33 @@ GEM
197197
method_source (~> 0.9.0)
198198
pry-rails (0.3.6)
199199
pry (>= 0.10.4)
200-
public_suffix (3.0.1)
200+
public_suffix (3.0.2)
201201
rack (2.0.4)
202202
rack-livereload (0.3.16)
203203
rack
204204
rack-test (0.8.2)
205205
rack (>= 1.0, < 3)
206-
rails (5.1.4)
207-
actioncable (= 5.1.4)
208-
actionmailer (= 5.1.4)
209-
actionpack (= 5.1.4)
210-
actionview (= 5.1.4)
211-
activejob (= 5.1.4)
212-
activemodel (= 5.1.4)
213-
activerecord (= 5.1.4)
214-
activesupport (= 5.1.4)
206+
rails (5.1.5)
207+
actioncable (= 5.1.5)
208+
actionmailer (= 5.1.5)
209+
actionpack (= 5.1.5)
210+
actionview (= 5.1.5)
211+
activejob (= 5.1.5)
212+
activemodel (= 5.1.5)
213+
activerecord (= 5.1.5)
214+
activesupport (= 5.1.5)
215215
bundler (>= 1.3.0)
216-
railties (= 5.1.4)
216+
railties (= 5.1.5)
217217
sprockets-rails (>= 2.0.0)
218218
rails-dom-testing (2.0.3)
219219
activesupport (>= 4.2.0)
220220
nokogiri (>= 1.6)
221221
rails-html-sanitizer (1.0.3)
222222
loofah (~> 2.0)
223223
rails-perftest (0.0.7)
224-
railties (5.1.4)
225-
actionpack (= 5.1.4)
226-
activesupport (= 5.1.4)
224+
railties (5.1.5)
225+
actionpack (= 5.1.5)
226+
activesupport (= 5.1.5)
227227
method_source
228228
rake (>= 0.8.7)
229229
thor (>= 0.18.1, < 2.0)
@@ -308,9 +308,9 @@ GEM
308308
turbolinks (5.1.0)
309309
turbolinks-source (~> 5.1)
310310
turbolinks-source (5.1.0)
311-
tzinfo (1.2.4)
311+
tzinfo (1.2.5)
312312
thread_safe (~> 0.1)
313-
uglifier (4.1.5)
313+
uglifier (4.1.6)
314314
execjs (>= 0.3.0, < 3)
315315
unicode-display_width (1.3.0)
316316
unicorn (5.4.0)
@@ -351,7 +351,7 @@ DEPENDENCIES
351351
pry
352352
pry-rails
353353
rack-livereload
354-
rails (= 5.1.4)
354+
rails (= 5.1.5)
355355
rails-perftest
356356
rake
357357
rb-fsevent

0 commit comments

Comments
 (0)