[DRE-commits] [diaspora] 06/07: remove sprockets embed from Gemfile

[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 df92bbb4671e81d38152f4ce36ba3b7e4875ce90
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jan 8 12:50:55 2016 +0530

    remove sprockets embed from Gemfile
---
 debian/patches/031-embedded-gems.patch | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian/patches/031-embedded-gems.patch b/debian/patches/031-embedded-gems.patch
index 1cadb5c..7c720d2 100644
--- a/debian/patches/031-embedded-gems.patch
+++ b/debian/patches/031-embedded-gems.patch
@@ -2,16 +2,12 @@ Index: diaspora/Gemfile
 ===================================================================
 --- diaspora.orig/Gemfile
 +++ diaspora/Gemfile
-@@ -53,8 +53,11 @@ gem "rack-cors", "0.4.0", require: "rack
+@@ -53,7 +53,7 @@ gem "rack-cors", "0.4.0", require: "rack
  
  # CSS
  
 -gem "bootstrap-sass", "2.3.2.2"
 +gem "bootstrap-sass", "2.3.2.2", path: 'vendor/gems/bootstrap-sass-2.3.2.2'
  gem "compass-rails",  "2.0.5"
-+# sprockets > 2.13 breaks compass-rails 
-+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810162
-+gem "sprockets", "2.12.4", path: 'vendor/gems/sprockets-2.12.4'
  gem "sass-rails",     "5.0.3"
  gem "autoprefixer-rails", "6.0.3"
- 

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