Remove addressable from Discourse.
This commit is contained in:
parent
23c1c5ef19
commit
0e73660c8d
5
Gemfile
5
Gemfile
|
@ -84,7 +84,8 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
|
|||
|
||||
gem 'omniauth-oauth2', require: false
|
||||
|
||||
gem 'omniauth-google-oauth2'
|
||||
# this removes the dependency on 'addressable'
|
||||
gem 'omniauth-google-oauth2', git: 'git://github.com/zquestz/omniauth-google-oauth2.git', ref: 'b492c4bb8286d35'
|
||||
gem 'oj'
|
||||
gem 'pg'
|
||||
gem 'pry-rails', require: false
|
||||
|
@ -184,7 +185,7 @@ begin
|
|||
gem 'stackprof', require: false, platform: [:mri_21, :mri_22, :mri_23]
|
||||
gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22, :mri_23]
|
||||
rescue Bundler::GemfileError
|
||||
begin
|
||||
begin
|
||||
STDERR.puts "You are running an old version of bundler, please upgrade bundler ASAP, if you are using Discourse docker, rebuild your container."
|
||||
gem 'stackprof', require: false, platform: [:mri_21, :mri_22]
|
||||
gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22]
|
||||
|
|
20
Gemfile.lock
20
Gemfile.lock
|
@ -1,3 +1,14 @@
|
|||
GIT
|
||||
remote: git://github.com/zquestz/omniauth-google-oauth2.git
|
||||
revision: b492c4bb8286d35ae1168d7f2e5c57769bfe45a0
|
||||
ref: b492c4bb8286d35
|
||||
specs:
|
||||
omniauth-google-oauth2 (0.3.0)
|
||||
jwt (~> 1.0)
|
||||
multi_json (~> 1.3)
|
||||
omniauth (>= 1.1.1)
|
||||
omniauth-oauth2 (>= 1.3.1)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
|
@ -38,7 +49,6 @@ GEM
|
|||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.4.0)
|
||||
annotate (2.7.0)
|
||||
activerecord (>= 3.2, < 6.0)
|
||||
rake (~> 10.4)
|
||||
|
@ -195,12 +205,6 @@ GEM
|
|||
omniauth-github-discourse (1.1.2)
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2 (~> 1.1)
|
||||
omniauth-google-oauth2 (0.3.0)
|
||||
addressable (~> 2.3)
|
||||
jwt (~> 1.0)
|
||||
multi_json (~> 1.3)
|
||||
omniauth (>= 1.1.1)
|
||||
omniauth-oauth2 (>= 1.3.1)
|
||||
omniauth-oauth (1.1.0)
|
||||
oauth
|
||||
omniauth (~> 1.0)
|
||||
|
@ -448,7 +452,7 @@ DEPENDENCIES
|
|||
omniauth
|
||||
omniauth-facebook
|
||||
omniauth-github-discourse
|
||||
omniauth-google-oauth2
|
||||
omniauth-google-oauth2!
|
||||
omniauth-oauth2
|
||||
omniauth-openid
|
||||
omniauth-twitter
|
||||
|
|
Loading…
Reference in New Issue