[DRE-commits] [diaspora] 04/09: loosen rails-assets-jquery

[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 269ffd4b83c0b52c167a11471d953118af3ab9cc
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Jul 13 22:56:42 2015 +0530

    loosen rails-assets-jquery
---
 debian/patches/030-loosen-tiny-versions.patch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/patches/030-loosen-tiny-versions.patch b/debian/patches/030-loosen-tiny-versions.patch
index 2a74d45..2396427 100644
--- a/debian/patches/030-loosen-tiny-versions.patch
+++ b/debian/patches/030-loosen-tiny-versions.patch
@@ -11,7 +11,7 @@ Index: diaspora/Gemfile
  
  # Database
  
-@@ -83,12 +83,12 @@ gem "entypo-rails", "~> 2.2.2"
+@@ -83,15 +83,15 @@ gem "entypo-rails", "~> 2.2.2"
  
  # JavaScript
  
@@ -25,7 +25,11 @@ Index: diaspora/Gemfile
 +gem "js-routes",                                        "~> 1.0.0"
  
  source "https://rails-assets.org" do
-   gem "rails-assets-jquery",                              "1.11.2" # Should be kept in sync with jquery-rails
+-  gem "rails-assets-jquery",                              "1.11.2" # Should be kept in sync with jquery-rails
++  gem "rails-assets-jquery",                              "~> 1.11.1" # Should be kept in sync with jquery-rails
+ 
+   gem "rails-assets-markdown-it",                         "4.2.1"
+   gem "rails-assets-markdown-it-hashtag",                 "0.3.1"
 @@ -157,8 +157,8 @@ gem "acts-as-taggable-on", "3.5.0"
  
  # URIs and HTTP

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