Skip to content

Commit 8bc75e2

Browse files
authored
update to newer version of rails (osulp#118)
* update to newer version of rails * update puma
1 parent fa88b18 commit 8bc75e2

File tree

2 files changed

+38
-40
lines changed

2 files changed

+38
-40
lines changed

Gemfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby '2.5.1'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
7-
gem 'rails', '~> 5.2.4.5'
8-
gem "activerecord", ">= 5.2.4.5"
7+
gem 'rails', '~> 5.2.4.6'
98

109
# Use sqlite3 as the database for Active Record
1110
gem 'sqlite3'

Gemfile.lock

+37-38
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.2.4.5)
5-
actionpack (= 5.2.4.5)
4+
actioncable (5.2.4.6)
5+
actionpack (= 5.2.4.6)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailer (5.2.4.5)
9-
actionpack (= 5.2.4.5)
10-
actionview (= 5.2.4.5)
11-
activejob (= 5.2.4.5)
8+
actionmailer (5.2.4.6)
9+
actionpack (= 5.2.4.6)
10+
actionview (= 5.2.4.6)
11+
activejob (= 5.2.4.6)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.2.4.5)
15-
actionview (= 5.2.4.5)
16-
activesupport (= 5.2.4.5)
14+
actionpack (5.2.4.6)
15+
actionview (= 5.2.4.6)
16+
activesupport (= 5.2.4.6)
1717
rack (~> 2.0, >= 2.0.8)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.2.4.5)
22-
activesupport (= 5.2.4.5)
21+
actionview (5.2.4.6)
22+
activesupport (= 5.2.4.6)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
@@ -29,20 +29,20 @@ GEM
2929
activemodel (>= 4.1, < 6)
3030
case_transform (>= 0.2)
3131
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
32-
activejob (5.2.4.5)
33-
activesupport (= 5.2.4.5)
32+
activejob (5.2.4.6)
33+
activesupport (= 5.2.4.6)
3434
globalid (>= 0.3.6)
35-
activemodel (5.2.4.5)
36-
activesupport (= 5.2.4.5)
37-
activerecord (5.2.4.5)
38-
activemodel (= 5.2.4.5)
39-
activesupport (= 5.2.4.5)
35+
activemodel (5.2.4.6)
36+
activesupport (= 5.2.4.6)
37+
activerecord (5.2.4.6)
38+
activemodel (= 5.2.4.6)
39+
activesupport (= 5.2.4.6)
4040
arel (>= 9.0)
41-
activestorage (5.2.4.5)
42-
actionpack (= 5.2.4.5)
43-
activerecord (= 5.2.4.5)
41+
activestorage (5.2.4.6)
42+
actionpack (= 5.2.4.6)
43+
activerecord (= 5.2.4.6)
4444
marcel (~> 0.3.1)
45-
activesupport (5.2.4.5)
45+
activesupport (5.2.4.6)
4646
concurrent-ruby (~> 1.0, >= 1.0.2)
4747
i18n (>= 0.7, < 2)
4848
minitest (~> 5.1)
@@ -124,18 +124,18 @@ GEM
124124
rack (2.2.3)
125125
rack-test (1.1.0)
126126
rack (>= 1.0, < 3)
127-
rails (5.2.4.5)
128-
actioncable (= 5.2.4.5)
129-
actionmailer (= 5.2.4.5)
130-
actionpack (= 5.2.4.5)
131-
actionview (= 5.2.4.5)
132-
activejob (= 5.2.4.5)
133-
activemodel (= 5.2.4.5)
134-
activerecord (= 5.2.4.5)
135-
activestorage (= 5.2.4.5)
136-
activesupport (= 5.2.4.5)
127+
rails (5.2.4.6)
128+
actioncable (= 5.2.4.6)
129+
actionmailer (= 5.2.4.6)
130+
actionpack (= 5.2.4.6)
131+
actionview (= 5.2.4.6)
132+
activejob (= 5.2.4.6)
133+
activemodel (= 5.2.4.6)
134+
activerecord (= 5.2.4.6)
135+
activestorage (= 5.2.4.6)
136+
activesupport (= 5.2.4.6)
137137
bundler (>= 1.3.0)
138-
railties (= 5.2.4.5)
138+
railties (= 5.2.4.6)
139139
sprockets-rails (>= 2.0.0)
140140
rails-controller-testing (1.0.2)
141141
actionpack (~> 5.x, >= 5.0.1)
@@ -146,9 +146,9 @@ GEM
146146
nokogiri (>= 1.6)
147147
rails-html-sanitizer (1.3.0)
148148
loofah (~> 2.3)
149-
railties (5.2.4.5)
150-
actionpack (= 5.2.4.5)
151-
activesupport (= 5.2.4.5)
149+
railties (5.2.4.6)
150+
actionpack (= 5.2.4.6)
151+
activesupport (= 5.2.4.6)
152152
method_source
153153
rake (>= 0.8.7)
154154
thor (>= 0.19.0, < 2.0)
@@ -214,7 +214,6 @@ PLATFORMS
214214

215215
DEPENDENCIES
216216
active_model_serializers (~> 0.10.0.rc3)
217-
activerecord (>= 5.2.4.5)
218217
bootsnap (>= 1.1.0)
219218
byebug
220219
capistrano (= 3.8.2)
@@ -226,7 +225,7 @@ DEPENDENCIES
226225
loofah (>= 2.3.1)
227226
mysql2
228227
puma (~> 5.3)
229-
rails (~> 5.2.4.5)
228+
rails (~> 5.2.4.6)
230229
rails-controller-testing
231230
rspec
232231
rspec-rails

0 commit comments

Comments
 (0)