scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-05 07:03:51 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1325 from Ducz0r/lm-update-doorkeeper

Browse source 
Update doorkeeper gem to >= 4.6
This commit is contained in:
Luka Murn 2018-10-05 12:05:32 +02:00 committed by GitHub
commit be06630109
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -17,7 +17,7 @@ gem 'recaptcha', require: 'recaptcha/rails'
gem 'sanitize', '~> 4.4' gem 'sanitize', '~> 4.4'
# Gems for OAuth2 subsystem # Gems for OAuth2 subsystem
gem 'doorkeeper', '~> 4.4' gem 'doorkeeper', '>= 4.6'
gem 'omniauth' gem 'omniauth'
gem 'omniauth-linkedin-oauth2' gem 'omniauth-linkedin-oauth2'

8
Gemfile.lock
View file

@ -216,7 +216,7 @@ GEM
discard (1.0.0) discard (1.0.0)
activerecord (>= 4.2, < 6) activerecord (>= 4.2, < 6)
docile (1.1.5) docile (1.1.5)
doorkeeper (4.4.1) doorkeeper (5.0.0)
railties (>= 4.2) railties (>= 4.2)
erubi (1.7.1) erubi (1.7.1)
execjs (2.7.0) execjs (2.7.0)
@ -308,7 +308,7 @@ GEM
rails (>= 3.2.0) rails (>= 3.2.0)
newrelic_rpm (4.7.1.340) newrelic_rpm (4.7.1.340)
nio4r (2.3.1) nio4r (2.3.1)
nokogiri (1.8.4) nokogiri (1.8.5)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
nokogumbo (1.5.0) nokogumbo (1.5.0)
nokogiri nokogiri
@ -357,7 +357,7 @@ GEM
public_suffix (3.0.2) public_suffix (3.0.2)
puma (3.11.2) puma (3.11.2)
rack (2.0.5) rack (2.0.5)
rack-test (1.0.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.1.6) rails (5.1.6)
actioncable (= 5.1.6) actioncable (= 5.1.6)
@ -565,7 +565,7 @@ DEPENDENCIES
devise_invitable devise_invitable
devise_security_extension! devise_security_extension!
discard (~> 1.0) discard (~> 1.0)
doorkeeper (~> 4.4) doorkeeper (>= 4.6)
factory_bot_rails factory_bot_rails
faker faker
figaro figaro