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

View File

@@ -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]