Skip to content

Commit b6cba2b

Browse files
authored
Merge branch 'develop' into dependabot/bundler/develop/aws-sdk-s3-1.91.0
2 parents ddcd01b + bfb7450 commit b6cba2b

Some content is hidden

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

41 files changed

+1847
-1511
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
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

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ GEM
438438
activemodel (>= 5.0)
439439
bindex (>= 0.4.0)
440440
railties (>= 5.0)
441-
webmock (3.12.0)
441+
webmock (3.12.1)
442442
addressable (>= 2.3.6)
443443
crack (>= 0.3.2)
444444
hashdiff (>= 0.4.0, < 2.0.0)
-40.5 KB
Binary file not shown.
40.5 KB
Binary file not shown.
-28.5 KB
Binary file not shown.
28.5 KB
Binary file not shown.
-208 KB
Binary file not shown.
208 KB
Binary file not shown.
-160 KB
Binary file not shown.
160 KB
Binary file not shown.

0 commit comments

Comments
 (0)