Skip to content

Commit a3686f4

Browse files
authored
Merge pull request #654 from codeRIT/develop
v2.2.4
2 parents 18c125e + dd47b4d commit a3686f4

Some content is hidden

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

59 files changed

+1907
-1571
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ gem 'bootsnap', '>= 1.1.0', require: false
4242
# Authentication
4343
gem 'devise', '~> 4.7'
4444
gem 'omniauth-mlh', '~> 0.4.2'
45-
gem 'doorkeeper', '~> 5.0'
45+
gem 'doorkeeper', '~> 5.5'
4646
gem 'devise-doorkeeper'
4747
gem 'omniauth-rails_csrf_protection'
4848

@@ -122,7 +122,7 @@ group :test do
122122
gem 'factory_bot_rails'
123123
gem 'codeclimate-test-reporter', '~> 1.0.7', require: nil
124124
gem 'rails-controller-testing' # Rails 4 fallback
125-
gem 'webmock', '~> 3.4'
125+
gem 'webmock', '~> 3.12'
126126
gem 'timecop'
127127

128128
# Adds support for Capybara system testing and selenium driver

Gemfile.lock

+57-57
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,43 @@ GIT
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (5.2.4.4)
14-
actionpack (= 5.2.4.4)
13+
actioncable (5.2.4.5)
14+
actionpack (= 5.2.4.5)
1515
nio4r (~> 2.0)
1616
websocket-driver (>= 0.6.1)
17-
actionmailer (5.2.4.4)
18-
actionpack (= 5.2.4.4)
19-
actionview (= 5.2.4.4)
20-
activejob (= 5.2.4.4)
17+
actionmailer (5.2.4.5)
18+
actionpack (= 5.2.4.5)
19+
actionview (= 5.2.4.5)
20+
activejob (= 5.2.4.5)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (5.2.4.4)
24-
actionview (= 5.2.4.4)
25-
activesupport (= 5.2.4.4)
23+
actionpack (5.2.4.5)
24+
actionview (= 5.2.4.5)
25+
activesupport (= 5.2.4.5)
2626
rack (~> 2.0, >= 2.0.8)
2727
rack-test (>= 0.6.3)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.0.2)
30-
actionview (5.2.4.4)
31-
activesupport (= 5.2.4.4)
30+
actionview (5.2.4.5)
31+
activesupport (= 5.2.4.5)
3232
builder (~> 3.1)
3333
erubi (~> 1.4)
3434
rails-dom-testing (~> 2.0)
3535
rails-html-sanitizer (~> 1.0, >= 1.0.3)
36-
activejob (5.2.4.4)
37-
activesupport (= 5.2.4.4)
36+
activejob (5.2.4.5)
37+
activesupport (= 5.2.4.5)
3838
globalid (>= 0.3.6)
39-
activemodel (5.2.4.4)
40-
activesupport (= 5.2.4.4)
41-
activerecord (5.2.4.4)
42-
activemodel (= 5.2.4.4)
43-
activesupport (= 5.2.4.4)
39+
activemodel (5.2.4.5)
40+
activesupport (= 5.2.4.5)
41+
activerecord (5.2.4.5)
42+
activemodel (= 5.2.4.5)
43+
activesupport (= 5.2.4.5)
4444
arel (>= 9.0)
45-
activestorage (5.2.4.4)
46-
actionpack (= 5.2.4.4)
47-
activerecord (= 5.2.4.4)
45+
activestorage (5.2.4.5)
46+
actionpack (= 5.2.4.5)
47+
activerecord (= 5.2.4.5)
4848
marcel (~> 0.3.1)
49-
activesupport (5.2.4.4)
49+
activesupport (5.2.4.5)
5050
concurrent-ruby (~> 1.0, >= 1.0.2)
5151
i18n (>= 0.7, < 2)
5252
minitest (~> 5.1)
@@ -62,21 +62,21 @@ GEM
6262
activerecord (>= 4.2, < 6.2)
6363
autoprefixer-rails (10.2.4.0)
6464
execjs
65-
aws-eventstream (1.1.0)
66-
aws-partitions (1.427.0)
67-
aws-sdk-core (3.112.0)
65+
aws-eventstream (1.1.1)
66+
aws-partitions (1.432.0)
67+
aws-sdk-core (3.113.0)
6868
aws-eventstream (~> 1, >= 1.0.2)
6969
aws-partitions (~> 1, >= 1.239.0)
7070
aws-sigv4 (~> 1.1)
7171
jmespath (~> 1.0)
72-
aws-sdk-kms (1.42.0)
72+
aws-sdk-kms (1.43.0)
7373
aws-sdk-core (~> 3, >= 3.112.0)
7474
aws-sigv4 (~> 1.1)
75-
aws-sdk-s3 (1.88.1)
75+
aws-sdk-s3 (1.91.0)
7676
aws-sdk-core (~> 3, >= 3.112.0)
7777
aws-sdk-kms (~> 1)
7878
aws-sigv4 (~> 1.1)
79-
aws-sigv4 (1.2.2)
79+
aws-sigv4 (1.2.3)
8080
aws-eventstream (~> 1, >= 1.0.2)
8181
bcrypt (3.1.13)
8282
better_errors (2.9.1)
@@ -114,8 +114,8 @@ GEM
114114
coderay (1.1.3)
115115
concurrent-ruby (1.1.8)
116116
connection_pool (2.2.3)
117-
crack (0.4.3)
118-
safe_yaml (~> 1.0.0)
117+
crack (0.4.5)
118+
rexml
119119
crass (1.0.6)
120120
css_parser (1.9.0)
121121
addressable
@@ -131,7 +131,7 @@ GEM
131131
doorkeeper
132132
rails
133133
docile (1.3.5)
134-
doorkeeper (5.4.0)
134+
doorkeeper (5.5.0)
135135
railties (>= 5)
136136
dotenv (2.7.6)
137137
dotenv-rails (2.7.6)
@@ -206,7 +206,7 @@ GEM
206206
httparty (0.18.1)
207207
mime-types (~> 3.0)
208208
multi_xml (>= 0.5.2)
209-
i18n (1.8.8)
209+
i18n (1.8.9)
210210
concurrent-ruby (~> 1.0)
211211
jmespath (1.4.0)
212212
jquery-rails (4.4.0)
@@ -236,7 +236,7 @@ GEM
236236
mimemagic (0.3.5)
237237
mini_mime (1.0.2)
238238
mini_portile2 (2.5.0)
239-
minitest (5.14.3)
239+
minitest (5.14.4)
240240
minitest-reporters (1.4.3)
241241
ansi
242242
builder
@@ -251,11 +251,11 @@ GEM
251251
mustache (1.1.1)
252252
mysql2 (0.5.3)
253253
nenv (0.3.0)
254-
nio4r (2.5.5)
255-
nokogiri (1.11.1)
254+
nio4r (2.5.7)
255+
nokogiri (1.11.2)
256256
mini_portile2 (~> 2.5.0)
257257
racc (~> 1.4)
258-
nokogiri (1.11.1-x86_64-darwin)
258+
nokogiri (1.11.2-x86_64-darwin)
259259
racc (~> 1.4)
260260
notiffany (0.1.3)
261261
nenv (~> 0.1)
@@ -286,7 +286,7 @@ GEM
286286
coderay (~> 1.1)
287287
method_source (~> 1.0)
288288
public_suffix (4.0.6)
289-
puma (5.2.1)
289+
puma (5.2.2)
290290
nio4r (~> 2.0)
291291
raabro (1.4.0)
292292
racc (1.5.2)
@@ -295,18 +295,18 @@ GEM
295295
rack (>= 2.0.0)
296296
rack-test (1.1.0)
297297
rack (>= 1.0, < 3)
298-
rails (5.2.4.4)
299-
actioncable (= 5.2.4.4)
300-
actionmailer (= 5.2.4.4)
301-
actionpack (= 5.2.4.4)
302-
actionview (= 5.2.4.4)
303-
activejob (= 5.2.4.4)
304-
activemodel (= 5.2.4.4)
305-
activerecord (= 5.2.4.4)
306-
activestorage (= 5.2.4.4)
307-
activesupport (= 5.2.4.4)
298+
rails (5.2.4.5)
299+
actioncable (= 5.2.4.5)
300+
actionmailer (= 5.2.4.5)
301+
actionpack (= 5.2.4.5)
302+
actionview (= 5.2.4.5)
303+
activejob (= 5.2.4.5)
304+
activemodel (= 5.2.4.5)
305+
activerecord (= 5.2.4.5)
306+
activestorage (= 5.2.4.5)
307+
activesupport (= 5.2.4.5)
308308
bundler (>= 1.3.0)
309-
railties (= 5.2.4.4)
309+
railties (= 5.2.4.5)
310310
sprockets-rails (>= 2.0.0)
311311
rails-controller-testing (1.0.5)
312312
actionpack (>= 5.0.1.rc1)
@@ -324,9 +324,9 @@ GEM
324324
rails_stdout_logging
325325
rails_serve_static_assets (0.0.5)
326326
rails_stdout_logging (0.0.5)
327-
railties (5.2.4.4)
328-
actionpack (= 5.2.4.4)
329-
activesupport (= 5.2.4.4)
327+
railties (5.2.4.5)
328+
actionpack (= 5.2.4.5)
329+
activesupport (= 5.2.4.5)
330330
method_source
331331
rake (>= 0.8.7)
332332
thor (>= 0.19.0, < 2.0)
@@ -340,6 +340,7 @@ GEM
340340
responders (3.0.1)
341341
actionpack (>= 5.0)
342342
railties (>= 5.0)
343+
rexml (3.2.4)
343344
roadie (4.0.0)
344345
css_parser (~> 1.4)
345346
nokogiri (~> 1.8)
@@ -354,7 +355,6 @@ GEM
354355
ruby_parser (3.14.2)
355356
sexp_processor (~> 4.9)
356357
rubyzip (2.3.0)
357-
safe_yaml (1.0.5)
358358
safely_block (0.3.0)
359359
errbase (>= 0.1.1)
360360
sass-rails (6.0.0)
@@ -371,9 +371,9 @@ GEM
371371
selenium-webdriver (3.142.7)
372372
childprocess (>= 0.5, < 4.0)
373373
rubyzip (>= 1.2.2)
374-
sendgrid-actionmailer (3.1.1)
374+
sendgrid-actionmailer (3.2.0)
375375
mail (~> 2.7)
376-
sendgrid-ruby (~> 6.0)
376+
sendgrid-ruby (~> 6.4)
377377
sendgrid-ruby (6.4.0)
378378
ruby_http_client (~> 3.4)
379379
sexp_processor (4.15.0)
@@ -438,7 +438,7 @@ GEM
438438
activemodel (>= 5.0)
439439
bindex (>= 0.4.0)
440440
railties (>= 5.0)
441-
webmock (3.8.3)
441+
webmock (3.12.1)
442442
addressable (>= 2.3.6)
443443
crack (>= 0.3.2)
444444
hashdiff (>= 0.4.0, < 2.0.0)
@@ -468,7 +468,7 @@ DEPENDENCIES
468468
codeclimate-test-reporter (~> 1.0.7)
469469
devise (~> 4.7)
470470
devise-doorkeeper
471-
doorkeeper (~> 5.0)
471+
doorkeeper (~> 5.5)
472472
dotenv-rails
473473
factory_bot_rails
474474
file_validators
@@ -522,7 +522,7 @@ DEPENDENCIES
522522
valid_attribute
523523
validate_url
524524
web-console (>= 3.3.0)
525-
webmock (~> 3.4)
525+
webmock (~> 3.12)
526526

527527
RUBY VERSION
528528
ruby 2.6.6p146

vendor/cache/actioncable-5.2.4.4.gem

-40.5 KB
Binary file not shown.

vendor/cache/actioncable-5.2.4.5.gem

40.5 KB
Binary file not shown.

vendor/cache/actionmailer-5.2.4.4.gem

-28.5 KB
Binary file not shown.

vendor/cache/actionmailer-5.2.4.5.gem

28.5 KB
Binary file not shown.

vendor/cache/actionpack-5.2.4.4.gem

-208 KB
Binary file not shown.

vendor/cache/actionpack-5.2.4.5.gem

208 KB
Binary file not shown.

vendor/cache/actionview-5.2.4.4.gem

-160 KB
Binary file not shown.

vendor/cache/actionview-5.2.4.5.gem

160 KB
Binary file not shown.

vendor/cache/activejob-5.2.4.4.gem

-25.5 KB
Binary file not shown.

vendor/cache/activejob-5.2.4.5.gem

26 KB
Binary file not shown.

vendor/cache/activemodel-5.2.4.4.gem

-55.5 KB
Binary file not shown.

vendor/cache/activemodel-5.2.4.5.gem

55.5 KB
Binary file not shown.

vendor/cache/activerecord-5.2.4.4.gem

-350 KB
Binary file not shown.

vendor/cache/activerecord-5.2.4.5.gem

350 KB
Binary file not shown.
-43.5 KB
Binary file not shown.
43.5 KB
Binary file not shown.
-373 KB
Binary file not shown.
373 KB
Binary file not shown.
-8.5 KB
Binary file not shown.
12.5 KB
Binary file not shown.
-23.5 KB
Binary file not shown.
32.5 KB
Binary file not shown.

vendor/cache/aws-sdk-core-3.112.0.gem

-280 KB
Binary file not shown.

vendor/cache/aws-sdk-core-3.113.0.gem

291 KB
Binary file not shown.

vendor/cache/aws-sdk-kms-1.42.0.gem

-80 KB
Binary file not shown.

vendor/cache/aws-sdk-kms-1.43.0.gem

85 KB
Binary file not shown.

vendor/cache/aws-sdk-s3-1.88.1.gem

-293 KB
Binary file not shown.

vendor/cache/aws-sdk-s3-1.91.0.gem

302 KB
Binary file not shown.

vendor/cache/aws-sigv4-1.2.2.gem

-11.5 KB
Binary file not shown.

vendor/cache/aws-sigv4-1.2.3.gem

16 KB
Binary file not shown.

vendor/cache/crack-0.4.3.gem

-562 KB
Binary file not shown.

vendor/cache/crack-0.4.5.gem

9 KB
Binary file not shown.

vendor/cache/doorkeeper-5.4.0.gem

-95 KB
Binary file not shown.

vendor/cache/doorkeeper-5.5.0.gem

99.5 KB
Binary file not shown.

vendor/cache/i18n-1.8.8.gem

-41 KB
Binary file not shown.

vendor/cache/i18n-1.8.9.gem

41 KB
Binary file not shown.

vendor/cache/minitest-5.14.3.gem

-83 KB
Binary file not shown.

vendor/cache/minitest-5.14.4.gem

84 KB
Binary file not shown.

vendor/cache/nio4r-2.5.5.gem

-119 KB
Binary file not shown.

vendor/cache/nio4r-2.5.7.gem

119 KB
Binary file not shown.
-5.98 MB
Binary file not shown.
5.97 MB
Binary file not shown.
Binary file not shown.

vendor/cache/puma-5.2.1.gem

-194 KB
Binary file not shown.

vendor/cache/puma-5.2.2.gem

194 KB
Binary file not shown.

vendor/cache/rails-5.2.4.4.gem

-6.5 KB
Binary file not shown.

vendor/cache/rails-5.2.4.5.gem

6.5 KB
Binary file not shown.

vendor/cache/railties-5.2.4.4.gem

-231 KB
Binary file not shown.

vendor/cache/railties-5.2.4.5.gem

231 KB
Binary file not shown.

vendor/cache/rexml-3.2.4.gem

76 KB
Binary file not shown.

vendor/cache/safe_yaml-1.0.5.gem

-30 KB
Binary file not shown.
-18 KB
Binary file not shown.
18.5 KB
Binary file not shown.

vendor/cache/webmock-3.12.1.gem

124 KB
Binary file not shown.

vendor/cache/webmock-3.8.3.gem

-120 KB
Binary file not shown.

0 commit comments

Comments
 (0)