Skip to content
This repository was archived by the owner on Mar 1, 2026. It is now read-only.

Commit 3f22650

Browse files
authored
Merge branch 'develop' into dependabot/bundler/develop/puma-5.2.2
2 parents 77d2a71 + 6af0dfd commit 3f22650

6 files changed

Lines changed: 4 additions & 4 deletions

File tree

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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)
@@ -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

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.

0 commit comments

Comments
 (0)