Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove addressable from Discourse.

This commit is contained in:
Guo Xiang Tan 2016-01-25 18:34:58 +08:00
parent 23c1c5ef19
commit 0e73660c8d
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile
View File

@ -84,7 +84,8 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
gem 'omniauth-oauth2', require: false 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 'oj'
gem 'pg' gem 'pg'
gem 'pry-rails', require: false gem 'pry-rails', require: false
@ -184,7 +185,7 @@ begin
gem 'stackprof', require: false, platform: [:mri_21, :mri_22, :mri_23] gem 'stackprof', require: false, platform: [:mri_21, :mri_22, :mri_23]
gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22, :mri_23] gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22, :mri_23]
rescue Bundler::GemfileError 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." 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 'stackprof', require: false, platform: [:mri_21, :mri_22]
gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22] gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22]

20
Gemfile.lock
View File

@ -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 GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
@ -38,7 +49,6 @@ GEM
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
addressable (2.4.0)
annotate (2.7.0) annotate (2.7.0)
activerecord (>= 3.2, < 6.0) activerecord (>= 3.2, < 6.0)
rake (~> 10.4) rake (~> 10.4)
@ -195,12 +205,6 @@ GEM
omniauth-github-discourse (1.1.2) omniauth-github-discourse (1.1.2)
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1) 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) omniauth-oauth (1.1.0)
oauth oauth
omniauth (~> 1.0) omniauth (~> 1.0)
@ -448,7 +452,7 @@ DEPENDENCIES
omniauth omniauth
omniauth-facebook omniauth-facebook
omniauth-github-discourse omniauth-github-discourse
omniauth-google-oauth2 omniauth-google-oauth2!
omniauth-oauth2 omniauth-oauth2
omniauth-openid omniauth-openid
omniauth-twitter omniauth-twitter