diff --git a/Gemfile b/Gemfile index 3a1b16d5e2b..0345d7ee1eb 100644 --- a/Gemfile +++ b/Gemfile @@ -216,9 +216,7 @@ gem 'rbtrace', require: false, platform: :mri # required for feed importing and embedding # -# temporary when this is merged https://github.com/cantino/ruby-readability/pull/70 -# get rid of this -gem 'ruby-readability-discourse', require: false +gem 'ruby-readability', require: false gem 'simple-rss', require: false gem 'gctools', require: false, platform: :mri_21 diff --git a/Gemfile.lock b/Gemfile.lock index 0dc855c39a4..736bbf99633 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -298,7 +298,7 @@ GEM rspec-mocks (~> 2.14.0) ruby-hmac (0.4.0) ruby-openid (2.5.0) - ruby-readability-discourse (0.6.1) + ruby-readability (0.6.1) guess_html_encoding (>= 0.0.4) nokogiri (>= 1.4.2) sanitize (2.1.0) @@ -457,7 +457,7 @@ DEPENDENCIES rinku rspec-given rspec-rails - ruby-readability-discourse + ruby-readability sanitize sass sass-rails (~> 4.0.2)