[DRE-commits] [diaspora] 227/257: remove twitter-text disabling patch

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit b39dabfa7fa02e2322168ab518bbb69586405764
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Mar 31 17:17:57 2015 +0530

    remove twitter-text disabling patch
---
 debian/patches/020-disable-twitter-text.patch | 13 -------------
 debian/patches/series                         |  1 -
 2 files changed, 14 deletions(-)

diff --git a/debian/patches/020-disable-twitter-text.patch b/debian/patches/020-disable-twitter-text.patch
deleted file mode 100644
index bb71772..0000000
--- a/debian/patches/020-disable-twitter-text.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: diaspora/Gemfile
-===================================================================
---- diaspora.orig/Gemfile
-+++ diaspora/Gemfile
-@@ -112,7 +112,7 @@ gem 'messagebus_ruby_api', '>= 1.0.3'
- 
- gem 'nokogiri',         '~> 1.6'
- gem 'redcarpet',        '3.2.0'
--gem 'twitter-text',     '1.10.0'
-+#gem 'twitter-text',     '1.10.0'
- gem 'roxml',            '>= 3.1.6'
- gem 'ruby-oembed',      '~> 0.8'
- gem 'opengraph_parser', '0.2.3'
diff --git a/debian/patches/series b/debian/patches/series
index d04fc09..bfde21e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,5 @@
 008-loosen-twitter-version.patch
 009-loosen-bootstrap-sass.patch
 018-loosen-rails-timeago.patch
-020-disable-twitter-text.patch
 021-loosen-omniauth-facebook-version.patch
 022-lower-fog-version.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git