[DRE-commits] [diaspora] 73/257: refresh loosen-bootstrap-sass.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 9a8099d6321c10739e5685d87b1ebe274e2a0f70
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Nov 19 01:58:05 2014 +0530

    refresh loosen-bootstrap-sass.patch
---
 debian/patches/009-loosen-bootstrap-sass.patch |  0
 debian/patches/loosen-bootstrap-sass.patch     | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/patches/009-loosen-bootstrap-sass.patch b/debian/patches/009-loosen-bootstrap-sass.patch
new file mode 100644
index 0000000..e69de29
diff --git a/debian/patches/loosen-bootstrap-sass.patch b/debian/patches/loosen-bootstrap-sass.patch
index ca7ab52..d377e08 100644
--- a/debian/patches/loosen-bootstrap-sass.patch
+++ b/debian/patches/loosen-bootstrap-sass.patch
@@ -1,11 +1,13 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -115,7 +115,7 @@
+Index: diaspora/Gemfile
+===================================================================
+--- diaspora.orig/Gemfile
++++ diaspora/Gemfile
+@@ -50,7 +50,7 @@ gem 'rack-cors', '0.2.9', :require => 'r
  
-   # CSS
+ # CSS
  
--  gem 'bootstrap-sass', '2.2.2.0'
-+  gem 'bootstrap-sass', '>= 2.2.2.0'
-   gem 'compass-rails',  '1.0.3'
-   gem 'sass-rails',     '3.2.6'
+-gem 'bootstrap-sass', '2.3.2.2'
++gem 'bootstrap-sass', '~> 2.3'
+ gem 'compass-rails',  '2.0.0'
+ gem 'sass-rails',     '4.0.4'
  

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