Skip to content

Commit 9dc7a4b

Browse files
authored
Merge pull request #903 from codeRIT/develop
Updates gems and Rails
2 parents 194fe0a + 06d8c7f commit 9dc7a4b

58 files changed

Lines changed: 68 additions & 68 deletions

Some content is hidden

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

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', '~> 6.0.2.2'
5+
gem 'rails', '~> 6.0.3.1'
66

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

Gemfile.lock

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.2.2)
5-
actionpack (= 6.0.2.2)
4+
actioncable (6.0.3.1)
5+
actionpack (= 6.0.3.1)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
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)
8+
actionmailbox (6.0.3.1)
9+
actionpack (= 6.0.3.1)
10+
activejob (= 6.0.3.1)
11+
activerecord (= 6.0.3.1)
12+
activestorage (= 6.0.3.1)
13+
activesupport (= 6.0.3.1)
1414
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)
15+
actionmailer (6.0.3.1)
16+
actionpack (= 6.0.3.1)
17+
actionview (= 6.0.3.1)
18+
activejob (= 6.0.3.1)
1919
mail (~> 2.5, >= 2.5.4)
2020
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.2.2)
22-
actionview (= 6.0.2.2)
23-
activesupport (= 6.0.2.2)
21+
actionpack (6.0.3.1)
22+
actionview (= 6.0.3.1)
23+
activesupport (= 6.0.3.1)
2424
rack (~> 2.0, >= 2.0.8)
2525
rack-test (>= 0.6.3)
2626
rails-dom-testing (~> 2.0)
2727
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)
28+
actiontext (6.0.3.1)
29+
actionpack (= 6.0.3.1)
30+
activerecord (= 6.0.3.1)
31+
activestorage (= 6.0.3.1)
32+
activesupport (= 6.0.3.1)
3333
nokogiri (>= 1.8.5)
34-
actionview (6.0.2.2)
35-
activesupport (= 6.0.2.2)
34+
actionview (6.0.3.1)
35+
activesupport (= 6.0.3.1)
3636
builder (~> 3.1)
3737
erubi (~> 1.4)
3838
rails-dom-testing (~> 2.0)
3939
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40-
activejob (6.0.2.2)
41-
activesupport (= 6.0.2.2)
40+
activejob (6.0.3.1)
41+
activesupport (= 6.0.3.1)
4242
globalid (>= 0.3.6)
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)
43+
activemodel (6.0.3.1)
44+
activesupport (= 6.0.3.1)
45+
activerecord (6.0.3.1)
46+
activemodel (= 6.0.3.1)
47+
activesupport (= 6.0.3.1)
48+
activestorage (6.0.3.1)
49+
actionpack (= 6.0.3.1)
50+
activejob (= 6.0.3.1)
51+
activerecord (= 6.0.3.1)
5252
marcel (~> 0.3.1)
53-
activesupport (6.0.2.2)
53+
activesupport (6.0.3.1)
5454
concurrent-ruby (~> 1.0, >= 1.0.2)
5555
i18n (>= 0.7, < 2)
5656
minitest (~> 5.1)
5757
tzinfo (~> 1.1)
58-
zeitwerk (~> 2.2)
58+
zeitwerk (~> 2.2, >= 2.2.2)
5959
ansi (1.5.0)
60-
better_errors (2.7.0)
60+
better_errors (2.7.1)
6161
coderay (>= 1.0.0)
6262
erubi (>= 1.0.0)
6363
rack (>= 0.9.0)
@@ -68,7 +68,7 @@ GEM
6868
builder (3.2.4)
6969
codeclimate-test-reporter (0.6.0)
7070
simplecov (>= 0.7.1, < 1.0.0)
71-
coderay (1.1.2)
71+
coderay (1.1.3)
7272
concurrent-ruby (1.1.6)
7373
crass (1.0.6)
7474
debug_inspector (0.0.3)
@@ -79,7 +79,7 @@ GEM
7979
railties (>= 3.2, < 6.1)
8080
erubi (1.9.0)
8181
execjs (2.7.0)
82-
ffi (1.12.2)
82+
ffi (1.13.1)
8383
font-awesome-rails (4.7.0.5)
8484
railties (>= 3.2, < 6.1)
8585
formatador (0.2.5)
@@ -98,12 +98,12 @@ GEM
9898
guard-minitest (2.4.6)
9999
guard-compat (~> 1.2)
100100
minitest (>= 3.0)
101-
httparty (0.18.0)
101+
httparty (0.18.1)
102102
mime-types (~> 3.0)
103103
multi_xml (>= 0.5.2)
104-
i18n (1.8.2)
104+
i18n (1.8.3)
105105
concurrent-ruby (~> 1.0)
106-
jquery-rails (4.3.5)
106+
jquery-rails (4.4.0)
107107
rails-dom-testing (>= 1, < 3)
108108
railties (>= 4.2.0)
109109
thor (>= 0.14, < 2.0)
@@ -113,19 +113,19 @@ GEM
113113
loofah (2.5.0)
114114
crass (~> 1.0.2)
115115
nokogiri (>= 1.5.9)
116-
lumberjack (1.2.4)
116+
lumberjack (1.2.5)
117117
mail (2.7.1)
118118
mini_mime (>= 0.1.1)
119119
marcel (0.3.3)
120120
mimemagic (~> 0.3.2)
121121
method_source (1.0.0)
122122
mime-types (3.3.1)
123123
mime-types-data (~> 3.2015)
124-
mime-types-data (3.2020.0425)
125-
mimemagic (0.3.4)
124+
mime-types-data (3.2020.0512)
125+
mimemagic (0.3.5)
126126
mini_mime (1.0.2)
127127
mini_portile2 (2.4.0)
128-
minitest (5.14.0)
128+
minitest (5.14.1)
129129
minitest-reporters (1.4.2)
130130
ansi
131131
builder
@@ -149,20 +149,20 @@ GEM
149149
rack (2.2.2)
150150
rack-test (1.1.0)
151151
rack (>= 1.0, < 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)
152+
rails (6.0.3.1)
153+
actioncable (= 6.0.3.1)
154+
actionmailbox (= 6.0.3.1)
155+
actionmailer (= 6.0.3.1)
156+
actionpack (= 6.0.3.1)
157+
actiontext (= 6.0.3.1)
158+
actionview (= 6.0.3.1)
159+
activejob (= 6.0.3.1)
160+
activemodel (= 6.0.3.1)
161+
activerecord (= 6.0.3.1)
162+
activestorage (= 6.0.3.1)
163+
activesupport (= 6.0.3.1)
164164
bundler (>= 1.3.0)
165-
railties (= 6.0.2.2)
165+
railties (= 6.0.3.1)
166166
sprockets-rails (>= 2.0.0)
167167
rails-controller-testing (1.0.4)
168168
actionpack (>= 5.0.1.x)
@@ -178,17 +178,17 @@ GEM
178178
rails_stdout_logging
179179
rails_serve_static_assets (0.0.5)
180180
rails_stdout_logging (0.0.5)
181-
railties (6.0.2.2)
182-
actionpack (= 6.0.2.2)
183-
activesupport (= 6.0.2.2)
181+
railties (6.0.3.1)
182+
actionpack (= 6.0.3.1)
183+
activesupport (= 6.0.3.1)
184184
method_source
185185
rake (>= 0.8.7)
186186
thor (>= 0.20.3, < 2.0)
187187
rake (13.0.1)
188-
rb-fsevent (0.10.3)
188+
rb-fsevent (0.10.4)
189189
rb-inotify (0.10.1)
190190
ffi (~> 1.0)
191-
rollbar (2.25.0)
191+
rollbar (2.25.1)
192192
ruby-progressbar (1.10.1)
193193
sass (3.7.4)
194194
sass-listen (~> 4.0.0)
@@ -223,7 +223,7 @@ GEM
223223
actionpack (>= 4.0)
224224
activesupport (>= 4.0)
225225
sprockets (>= 3.0.0)
226-
test-unit (3.3.5)
226+
test-unit (3.3.6)
227227
power_assert
228228
thor (1.0.1)
229229
thread_safe (0.3.6)
@@ -233,9 +233,9 @@ GEM
233233
uglifier (4.2.0)
234234
execjs (>= 0.3.0, < 3)
235235
valid_attribute (2.0.0)
236-
websocket-driver (0.7.1)
236+
websocket-driver (0.7.2)
237237
websocket-extensions (>= 0.1.0)
238-
websocket-extensions (0.1.4)
238+
websocket-extensions (0.1.5)
239239
zeitwerk (2.3.0)
240240

241241
PLATFORMS
@@ -254,7 +254,7 @@ DEPENDENCIES
254254
jquery-rails (~> 4.3)
255255
minitest-reporters
256256
puma
257-
rails (~> 6.0.2.2)
257+
rails (~> 6.0.3.1)
258258
rails-controller-testing
259259
rails_12factor
260260
rollbar (~> 2.8)
-41.5 KB
Binary file not shown.
41.5 KB
Binary file not shown.
-20 KB
Binary file not shown.
20.5 KB
Binary file not shown.
-30 KB
Binary file not shown.
30 KB
Binary file not shown.
-212 KB
Binary file not shown.
212 KB
Binary file not shown.

0 commit comments

Comments
 (0)