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

Drop the fork usage of fastimage (#5461) 

Fork is not needed anymore since fastimage 2.1.1 has been released with the needed PR merged in.
This commit is contained in:
Jano Suchal 2018-01-04 09:53:53 +01:00 committed by Régis Hanol
parent 77a92e8878
commit 05ec1be101
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -53,8 +53,7 @@ gem 'fast_xs'
gem 'fast_xor' gem 'fast_xor'
# Forked until https://github.com/sdsykes/fastimage/pull/93 is merged gem 'fastimage'
gem 'discourse_fastimage', require: 'fastimage'
gem 'aws-sdk-s3', require: false gem 'aws-sdk-s3', require: false
gem 'excon', require: false gem 'excon', require: false

6
Gemfile.lock
View File

@ -85,7 +85,6 @@ GEM
diff-lcs (1.3) diff-lcs (1.3)
discourse-qunit-rails (0.0.11) discourse-qunit-rails (0.0.11)
railties railties
discourse_fastimage (2.1.0)
discourse_image_optim (0.24.5) discourse_image_optim (0.24.5)
exifr (~> 1.2, >= 1.2.2) exifr (~> 1.2, >= 1.2.2)
fspath (~> 3.0) fspath (~> 3.0)
@ -120,6 +119,7 @@ GEM
rake rake
rake-compiler rake-compiler
fast_xs (0.8.0) fast_xs (0.8.0)
fastimage (2.1.1)
ffi (1.9.18) ffi (1.9.18)
flamegraph (0.9.5) flamegraph (0.9.5)
foreman (0.84.0) foreman (0.84.0)
@ -420,7 +420,6 @@ DEPENDENCIES
certified certified
cppjieba_rb cppjieba_rb
discourse-qunit-rails discourse-qunit-rails
discourse_fastimage
discourse_image_optim discourse_image_optim
email_reply_trimmer (= 0.1.8) email_reply_trimmer (= 0.1.8)
ember-handlebars-template (= 0.7.5) ember-handlebars-template (= 0.7.5)
@ -433,6 +432,7 @@ DEPENDENCIES
fast_blank fast_blank
fast_xor fast_xor
fast_xs fast_xs
fastimage
flamegraph flamegraph
foreman foreman
gc_tracer gc_tracer
@ -509,4 +509,4 @@ DEPENDENCIES
webmock webmock
BUNDLED WITH BUNDLED WITH
1.16.0 1.16.1