[DRE-commits] [diaspora] 257/257: update bootstrap-sass imports

[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 e610ddee1b314604a90ced08198aff65b32e45a8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Apr 12 16:51:24 2015 +0530

    update bootstrap-sass imports
---
 debian/patches/009-loosen-bootstrap-sass.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/debian/patches/009-loosen-bootstrap-sass.patch b/debian/patches/009-loosen-bootstrap-sass.patch
index e55c7da..dbdc030 100644
--- a/debian/patches/009-loosen-bootstrap-sass.patch
+++ b/debian/patches/009-loosen-bootstrap-sass.patch
@@ -11,3 +11,20 @@ Index: diaspora/Gemfile
  gem "compass-rails",  "2.0.4"
  gem "sass-rails",     "5.0.1"
  gem "autoprefixer-rails", "5.1.7.1"
+Index: diaspora/app/assets/javascripts/main.js
+===================================================================
+--- diaspora.orig/app/assets/javascripts/main.js
++++ diaspora/app/assets/javascripts/main.js
+@@ -40,8 +40,8 @@
+ //= require view
+ //= require aspects-dropdown
+ //= require mentions
+-//= require bootstrap-tooltip
+-//= require bootstrap-popover
+-//= require bootstrap-dropdown
+-//= require bootstrap-modal
++//= require bootstrap/tooltip
++//= require bootstrap/popover
++//= require bootstrap/dropdown
++//= require bootstrap/modal
+ //= require osmlocator

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