Skip to content

Commit e94f4f6

Browse files
authored
Merge pull request #895 from codeRIT/develop
Upgrade Ruby and Rails
2 parents 97093bd + f9f32da commit e94f4f6

128 files changed

Lines changed: 122 additions & 111 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.1
1+
2.7.1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.6.1
1+
FROM ruby:2.7.1
22

33
RUN apt-get update -qq && apt-get install -y build-essential
44

Gemfile

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

33
ruby IO.read(File.expand_path('.ruby-version', __dir__)).chomp
44

5-
gem 'rails', '~> 5.2.0'
5+
gem 'rails', '~> 6.0.2.2'
66

77
gem 'puma'
88
gem 'uglifier', '>= 1.3.0'

Gemfile.lock

Lines changed: 119 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,91 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.2.3)
5-
actionpack (= 5.2.3)
4+
actioncable (6.0.2.2)
5+
actionpack (= 6.0.2.2)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailer (5.2.3)
9-
actionpack (= 5.2.3)
10-
actionview (= 5.2.3)
11-
activejob (= 5.2.3)
8+
actionmailbox (6.0.2.2)
9+
actionpack (= 6.0.2.2)
10+
activejob (= 6.0.2.2)
11+
activerecord (= 6.0.2.2)
12+
activestorage (= 6.0.2.2)
13+
activesupport (= 6.0.2.2)
14+
mail (>= 2.7.1)
15+
actionmailer (6.0.2.2)
16+
actionpack (= 6.0.2.2)
17+
actionview (= 6.0.2.2)
18+
activejob (= 6.0.2.2)
1219
mail (~> 2.5, >= 2.5.4)
1320
rails-dom-testing (~> 2.0)
14-
actionpack (5.2.3)
15-
actionview (= 5.2.3)
16-
activesupport (= 5.2.3)
17-
rack (~> 2.0)
21+
actionpack (6.0.2.2)
22+
actionview (= 6.0.2.2)
23+
activesupport (= 6.0.2.2)
24+
rack (~> 2.0, >= 2.0.8)
1825
rack-test (>= 0.6.3)
1926
rails-dom-testing (~> 2.0)
20-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.2.3)
22-
activesupport (= 5.2.3)
27+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28+
actiontext (6.0.2.2)
29+
actionpack (= 6.0.2.2)
30+
activerecord (= 6.0.2.2)
31+
activestorage (= 6.0.2.2)
32+
activesupport (= 6.0.2.2)
33+
nokogiri (>= 1.8.5)
34+
actionview (6.0.2.2)
35+
activesupport (= 6.0.2.2)
2336
builder (~> 3.1)
2437
erubi (~> 1.4)
2538
rails-dom-testing (~> 2.0)
26-
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.2.3)
28-
activesupport (= 5.2.3)
39+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40+
activejob (6.0.2.2)
41+
activesupport (= 6.0.2.2)
2942
globalid (>= 0.3.6)
30-
activemodel (5.2.3)
31-
activesupport (= 5.2.3)
32-
activerecord (5.2.3)
33-
activemodel (= 5.2.3)
34-
activesupport (= 5.2.3)
35-
arel (>= 9.0)
36-
activestorage (5.2.3)
37-
actionpack (= 5.2.3)
38-
activerecord (= 5.2.3)
43+
activemodel (6.0.2.2)
44+
activesupport (= 6.0.2.2)
45+
activerecord (6.0.2.2)
46+
activemodel (= 6.0.2.2)
47+
activesupport (= 6.0.2.2)
48+
activestorage (6.0.2.2)
49+
actionpack (= 6.0.2.2)
50+
activejob (= 6.0.2.2)
51+
activerecord (= 6.0.2.2)
3952
marcel (~> 0.3.1)
40-
activesupport (5.2.3)
53+
activesupport (6.0.2.2)
4154
concurrent-ruby (~> 1.0, >= 1.0.2)
4255
i18n (>= 0.7, < 2)
4356
minitest (~> 5.1)
4457
tzinfo (~> 1.1)
58+
zeitwerk (~> 2.2)
4559
ansi (1.5.0)
46-
arel (9.0.0)
47-
better_errors (2.5.1)
60+
better_errors (2.7.0)
4861
coderay (>= 1.0.0)
4962
erubi (>= 1.0.0)
5063
rack (>= 0.9.0)
5164
binding_of_caller (0.8.0)
5265
debug_inspector (>= 0.0.1)
53-
bootsnap (1.4.4)
66+
bootsnap (1.4.6)
5467
msgpack (~> 1.0)
55-
builder (3.2.3)
68+
builder (3.2.4)
5669
codeclimate-test-reporter (0.6.0)
5770
simplecov (>= 0.7.1, < 1.0.0)
5871
coderay (1.1.2)
59-
concurrent-ruby (1.1.5)
60-
crass (1.0.5)
72+
concurrent-ruby (1.1.6)
73+
crass (1.0.6)
6174
debug_inspector (0.0.3)
62-
docile (1.3.1)
63-
dotenv (2.7.2)
64-
dotenv-rails (2.7.2)
65-
dotenv (= 2.7.2)
75+
docile (1.3.2)
76+
dotenv (2.7.5)
77+
dotenv-rails (2.7.5)
78+
dotenv (= 2.7.5)
6679
railties (>= 3.2, < 6.1)
67-
erubi (1.8.0)
80+
erubi (1.9.0)
6881
execjs (2.7.0)
69-
ffi (1.11.1)
82+
ffi (1.12.2)
7083
font-awesome-rails (4.7.0.5)
7184
railties (>= 3.2, < 6.1)
7285
formatador (0.2.5)
7386
globalid (0.4.2)
7487
activesupport (>= 4.2.0)
75-
guard (2.15.0)
88+
guard (2.16.2)
7689
formatador (>= 0.2.4)
7790
listen (>= 2.7, < 4.0)
7891
lumberjack (>= 1.0.12, < 2.0)
@@ -85,71 +98,71 @@ GEM
8598
guard-minitest (2.4.6)
8699
guard-compat (~> 1.2)
87100
minitest (>= 3.0)
88-
httparty (0.17.0)
101+
httparty (0.18.0)
89102
mime-types (~> 3.0)
90103
multi_xml (>= 0.5.2)
91-
i18n (1.6.0)
104+
i18n (1.8.2)
92105
concurrent-ruby (~> 1.0)
93-
jquery-rails (4.3.3)
106+
jquery-rails (4.3.5)
94107
rails-dom-testing (>= 1, < 3)
95108
railties (>= 4.2.0)
96109
thor (>= 0.14, < 2.0)
97-
json (2.2.0)
98-
listen (3.1.5)
99-
rb-fsevent (~> 0.9, >= 0.9.4)
100-
rb-inotify (~> 0.9, >= 0.9.7)
101-
ruby_dep (~> 1.2)
102-
loofah (2.3.1)
110+
listen (3.2.1)
111+
rb-fsevent (~> 0.10, >= 0.10.3)
112+
rb-inotify (~> 0.9, >= 0.9.10)
113+
loofah (2.5.0)
103114
crass (~> 1.0.2)
104115
nokogiri (>= 1.5.9)
105-
lumberjack (1.0.13)
116+
lumberjack (1.2.4)
106117
mail (2.7.1)
107118
mini_mime (>= 0.1.1)
108119
marcel (0.3.3)
109120
mimemagic (~> 0.3.2)
110-
method_source (0.9.2)
111-
mime-types (3.2.2)
121+
method_source (1.0.0)
122+
mime-types (3.3.1)
112123
mime-types-data (~> 3.2015)
113-
mime-types-data (3.2019.0331)
114-
mimemagic (0.3.3)
115-
mini_mime (1.0.1)
124+
mime-types-data (3.2020.0425)
125+
mimemagic (0.3.4)
126+
mini_mime (1.0.2)
116127
mini_portile2 (2.4.0)
117-
minitest (5.11.3)
118-
minitest-reporters (1.3.6)
128+
minitest (5.14.0)
129+
minitest-reporters (1.4.2)
119130
ansi
120131
builder
121132
minitest (>= 5.0)
122133
ruby-progressbar
123-
msgpack (1.2.10)
124-
multi_json (1.13.1)
134+
msgpack (1.3.3)
125135
multi_xml (0.6.0)
126136
nenv (0.3.0)
127-
nio4r (2.3.1)
128-
nokogiri (1.10.8)
137+
nio4r (2.5.2)
138+
nokogiri (1.10.9)
129139
mini_portile2 (~> 2.4.0)
130-
notiffany (0.1.1)
140+
notiffany (0.1.3)
131141
nenv (~> 0.1)
132142
shellany (~> 0.0)
133-
power_assert (1.1.4)
134-
pry (0.12.2)
135-
coderay (~> 1.1.0)
136-
method_source (~> 0.9.0)
137-
puma (3.12.4)
138-
rack (2.0.8)
143+
power_assert (1.2.0)
144+
pry (0.13.1)
145+
coderay (~> 1.1)
146+
method_source (~> 1.0)
147+
puma (4.3.3)
148+
nio4r (~> 2.0)
149+
rack (2.2.2)
139150
rack-test (1.1.0)
140151
rack (>= 1.0, < 3)
141-
rails (5.2.3)
142-
actioncable (= 5.2.3)
143-
actionmailer (= 5.2.3)
144-
actionpack (= 5.2.3)
145-
actionview (= 5.2.3)
146-
activejob (= 5.2.3)
147-
activemodel (= 5.2.3)
148-
activerecord (= 5.2.3)
149-
activestorage (= 5.2.3)
150-
activesupport (= 5.2.3)
152+
rails (6.0.2.2)
153+
actioncable (= 6.0.2.2)
154+
actionmailbox (= 6.0.2.2)
155+
actionmailer (= 6.0.2.2)
156+
actionpack (= 6.0.2.2)
157+
actiontext (= 6.0.2.2)
158+
actionview (= 6.0.2.2)
159+
activejob (= 6.0.2.2)
160+
activemodel (= 6.0.2.2)
161+
activerecord (= 6.0.2.2)
162+
activestorage (= 6.0.2.2)
163+
activesupport (= 6.0.2.2)
151164
bundler (>= 1.3.0)
152-
railties (= 5.2.3)
165+
railties (= 6.0.2.2)
153166
sprockets-rails (>= 2.0.0)
154167
rails-controller-testing (1.0.4)
155168
actionpack (>= 5.0.1.x)
@@ -158,34 +171,32 @@ GEM
158171
rails-dom-testing (2.0.3)
159172
activesupport (>= 4.2.0)
160173
nokogiri (>= 1.6)
161-
rails-html-sanitizer (1.0.4)
162-
loofah (~> 2.2, >= 2.2.2)
174+
rails-html-sanitizer (1.3.0)
175+
loofah (~> 2.3)
163176
rails_12factor (0.0.3)
164177
rails_serve_static_assets
165178
rails_stdout_logging
166179
rails_serve_static_assets (0.0.5)
167180
rails_stdout_logging (0.0.5)
168-
railties (5.2.3)
169-
actionpack (= 5.2.3)
170-
activesupport (= 5.2.3)
181+
railties (6.0.2.2)
182+
actionpack (= 6.0.2.2)
183+
activesupport (= 6.0.2.2)
171184
method_source
172185
rake (>= 0.8.7)
173-
thor (>= 0.19.0, < 2.0)
186+
thor (>= 0.20.3, < 2.0)
174187
rake (13.0.1)
175188
rb-fsevent (0.10.3)
176-
rb-inotify (0.10.0)
189+
rb-inotify (0.10.1)
177190
ffi (~> 1.0)
178-
rollbar (2.19.4)
179-
multi_json
180-
ruby-progressbar (1.10.0)
181-
ruby_dep (1.5.0)
191+
rollbar (2.25.0)
192+
ruby-progressbar (1.10.1)
182193
sass (3.7.4)
183194
sass-listen (~> 4.0.0)
184195
sass-listen (4.0.0)
185196
rb-fsevent (~> 0.9, >= 0.9.4)
186197
rb-inotify (~> 0.9, >= 0.9.7)
187-
sass-rails (5.0.7)
188-
railties (>= 4.0.0, < 6)
198+
sass-rails (5.1.0)
199+
railties (>= 5.2.0)
189200
sass (~> 3.1)
190201
sprockets (>= 2.8, < 4.0)
191202
sprockets-rails (>= 2.0, < 4.0)
@@ -197,14 +208,13 @@ GEM
197208
shoulda-context (1.2.2)
198209
shoulda-matchers (3.1.3)
199210
activesupport (>= 4.0.0)
200-
simplecov (0.16.1)
211+
simplecov (0.18.5)
201212
docile (~> 1.1)
202-
json (>= 1.8, < 3)
203-
simplecov-html (~> 0.10.0)
204-
simplecov-html (0.10.2)
205-
skylight (4.0.2)
206-
skylight-core (= 4.0.2)
207-
skylight-core (4.0.2)
213+
simplecov-html (~> 0.11)
214+
simplecov-html (0.12.2)
215+
skylight (4.3.0)
216+
skylight-core (= 4.3.0)
217+
skylight-core (4.3.0)
208218
activesupport (>= 4.2.0)
209219
sprockets (3.7.2)
210220
concurrent-ruby (~> 1.0)
@@ -213,19 +223,20 @@ GEM
213223
actionpack (>= 4.0)
214224
activesupport (>= 4.0)
215225
sprockets (>= 3.0.0)
216-
test-unit (3.3.3)
226+
test-unit (3.3.5)
217227
power_assert
218-
thor (0.20.3)
228+
thor (1.0.1)
219229
thread_safe (0.3.6)
220-
tilt (2.0.9)
221-
tzinfo (1.2.5)
230+
tilt (2.0.10)
231+
tzinfo (1.2.7)
222232
thread_safe (~> 0.1)
223-
uglifier (4.1.20)
233+
uglifier (4.2.0)
224234
execjs (>= 0.3.0, < 3)
225235
valid_attribute (2.0.0)
226-
websocket-driver (0.7.0)
236+
websocket-driver (0.7.1)
227237
websocket-extensions (>= 0.1.0)
228-
websocket-extensions (0.1.3)
238+
websocket-extensions (0.1.4)
239+
zeitwerk (2.3.0)
229240

230241
PLATFORMS
231242
ruby
@@ -243,7 +254,7 @@ DEPENDENCIES
243254
jquery-rails (~> 4.3)
244255
minitest-reporters
245256
puma
246-
rails (~> 5.2.0)
257+
rails (~> 6.0.2.2)
247258
rails-controller-testing
248259
rails_12factor
249260
rollbar (~> 2.8)
@@ -256,7 +267,7 @@ DEPENDENCIES
256267
valid_attribute
257268

258269
RUBY VERSION
259-
ruby 2.6.1p33
270+
ruby 2.7.1p83
260271

261272
BUNDLED WITH
262-
1.17.2
273+
2.1.4

vendor/cache/actioncable-5.2.3.gem

-40.5 KB
Binary file not shown.
41.5 KB
Binary file not shown.
20 KB
Binary file not shown.
-28.5 KB
Binary file not shown.
30 KB
Binary file not shown.

vendor/cache/actionpack-5.2.3.gem

-207 KB
Binary file not shown.

0 commit comments

Comments
 (0)