[DRE-commits] [gitlab] 03/04: relax jquery-rails

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master-8.10
in repository gitlab.

commit d090e715ec7d1354abe07dca2cb8956b72cb4030
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Aug 25 20:41:26 2016 +0530

    relax jquery-rails
---
 debian/patches/0200-use-jquery-for-jquery2.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/debian/patches/0200-use-jquery-for-jquery2.patch b/debian/patches/0200-use-jquery-for-jquery2.patch
index c594df6..b50ee5c 100644
--- a/debian/patches/0200-use-jquery-for-jquery2.patch
+++ b/debian/patches/0200-use-jquery-for-jquery2.patch
@@ -14,3 +14,16 @@ Index: gitlab/app/assets/javascripts/application.js.coffee
  #= require jquery-ui/autocomplete
  #= require jquery-ui/datepicker
  #= require jquery-ui/draggable
+Index: gitlab/Gemfile
+===================================================================
+--- gitlab.orig/Gemfile
++++ gitlab/Gemfile
+@@ -227,7 +227,7 @@ gem 'font-awesome-rails', '~> 4.6', '>=
+ gem 'gemojione',          '~> 3.0'
+ gem 'gon',                '~> 6.0', '>= 6.0.1'
+ gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
+-gem 'jquery-rails',       '~> 4.1'
++gem 'jquery-rails',       '~> 4.0'
+ gem 'jquery-ui-rails',    '~> 5.0'
+ gem 'request_store',      '~> 1.3'
+ gem 'select2-rails',      '~> 3.5', '>= 3.5.9'

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