Download as
Browse Code »

Commit 935a2ae1af31d48befe9a08bbe7ae690bc55579e

Authored by Antonio Terceiro
1 parent 7631ef3d
Exists in master and in 5 other branches colab-master, gitlab-pkg, kalibro-configurations, update_colab_deps, update_noosfero_deps

Remove patch that is not needed anymore

Showing 2 changed files with 1 additions and 28 deletions   Show diff stats
gitlab-7.5.2-jquery-ui-5.patch
View file @7631ef3
@@ -1,26 +0,0 @@ @@ -1,26 +0,0 @@
1 -diff -Nru gitlab-7.5.2.orig/app/assets/javascripts/application.js.coffee gitlab-7.5.2/app/assets/javascripts/application.js.coffee  
2 ---- gitlab-7.5.2.orig/app/assets/javascripts/application.js.coffee 2014-12-11 12:58:48.412000000 -0500  
3 -+++ gitlab-7.5.2/app/assets/javascripts/application.js.coffee 2014-12-11 12:59:16.902000000 -0500  
4 -@@ -5,7 +5,7 @@  
5 - # the compiled file.  
6 - #  
7 - #= require jquery  
8 --#= require jquery.ui.all  
9 -+#= require jquery-ui  
10 - #= require jquery_ujs  
11 - #= require jquery.cookie  
12 - #= require jquery.endless-scroll  
13 -diff -Nru gitlab-7.5.2.orig/app/assets/stylesheets/application.scss gitlab-7.5.2/app/assets/stylesheets/application.scss  
14 ---- gitlab-7.5.2.orig/app/assets/stylesheets/application.scss 2014-12-11 12:58:48.418000000 -0500  
15 -+++ gitlab-7.5.2/app/assets/stylesheets/application.scss 2014-12-11 13:00:04.418000000 -0500  
16 -@@ -2,8 +2,8 @@  
17 - * This is a manifest file that'll automatically include all the stylesheets available in this directory  
18 - * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at  
19 - * the top of the compiled file, but it's generally better to create a new file per style scope.  
20 -- *= require jquery.ui.datepicker  
21 -- *= require jquery.ui.autocomplete  
22 -+ *= require jquery-ui/datepicker  
23 -+ *= require jquery-ui/autocomplete  
24 - *= require jquery.atwho  
25 - *= require select2  
26 - *= require highlightjs.min  
1 Name: gitlab 1 Name: gitlab
2 Version: 7.6.2 2 Version: 7.6.2
3 -Release: 2%{?dist} 3 +Release: 3%{?dist}
4 Summary: Software Development Platform 4 Summary: Software Development Platform
5 Group: Development/Tools 5 Group: Development/Tools
6 License: Expat 6 License: Expat
7 URL: https://beta.softwarepublico.gov.br/gitlab/softwarepublico/gitlab 7 URL: https://beta.softwarepublico.gov.br/gitlab/softwarepublico/gitlab
8 Source0: %{name}-%{version}.tar.gz 8 Source0: %{name}-%{version}.tar.gz
9 -Patch0: gitlab-7.5.2-jquery-ui-5.patch  
10 BuildArch: noarch 9 BuildArch: noarch
11 BuildRequires: gitlab-deps 10 BuildRequires: gitlab-deps
12 Requires: gitlab-deps, gitlab-shell, git 11 Requires: gitlab-deps, gitlab-shell, git