[DRE-commits] [gitlab] 01/01: adjust asset names for jquery-ui

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab.

commit 44e2882fb71283e648ac91b4ed1fa45e34f3166a
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Nov 4 01:51:30 2015 +0530

    adjust asset names for jquery-ui
---
 debian/patches/0035-loosen-jquery-ui-rails.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/debian/patches/0035-loosen-jquery-ui-rails.patch b/debian/patches/0035-loosen-jquery-ui-rails.patch
index 8919af8..259696d 100644
--- a/debian/patches/0035-loosen-jquery-ui-rails.patch
+++ b/debian/patches/0035-loosen-jquery-ui-rails.patch
@@ -11,3 +11,25 @@ Index: gitlab/Gemfile
  gem 'nprogress-rails',    '~> 0.1.2.3'
  gem 'raphael-rails',      '~> 2.1.2'
  gem 'request_store',      '~> 1.2.0'
+Index: gitlab/app/assets/stylesheets/application.scss
+===================================================================
+--- gitlab.orig/app/assets/stylesheets/application.scss
++++ gitlab/app/assets/stylesheets/application.scss
+@@ -2,8 +2,8 @@
+  * This is a manifest file that'll automatically include all the stylesheets available in this directory
+  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+  * the top of the compiled file, but it's generally better to create a new file per style scope.
+- *= require jquery.ui.datepicker
+- *= require jquery.ui.autocomplete
++ *= require jquery-ui/datepicker
++ *= require jquery-ui/autocomplete
+  *= require jquery.atwho
+  *= require select2
+  *= require_self
+@@ -48,4 +48,4 @@
+ /*
+  * Styles for JS behaviors.
+  */
+- at import "behaviors.scss";
+\ No newline at end of file
++ at import "behaviors.scss";

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