Commit d6a3e9a96ff96d02fa421c415ef3c78c9e09383c
1 parent
539a1679
Exists in
master
and in
79 other branches
patch for newer jquery-ui gem
Showing
2 changed files
with
29 additions
and
1 deletions
Show diff stats
| @@ -0,0 +1,26 @@ | @@ -0,0 +1,26 @@ | ||
| 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 |
gitlab.spec
| @@ -6,6 +6,7 @@ Group: Development/Tools | @@ -6,6 +6,7 @@ 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 | ||
| 9 | BuildArch: noarch | 10 | BuildArch: noarch |
| 10 | BuildRequires: gitlab-deps | 11 | BuildRequires: gitlab-deps |
| 11 | Requires: gitlab-deps, git | 12 | Requires: gitlab-deps, git |
| @@ -14,7 +15,8 @@ Requires: gitlab-deps, git | @@ -14,7 +15,8 @@ Requires: gitlab-deps, git | ||
| 14 | GitLab | 15 | GitLab |
| 15 | 16 | ||
| 16 | %prep | 17 | %prep |
| 17 | -%autosetup | 18 | +%setup -q |
| 19 | +%patch0 -p 1 | ||
| 18 | 20 | ||
| 19 | %build | 21 | %build |
| 20 | cat > config/gitlab.yml <<EOF | 22 | cat > config/gitlab.yml <<EOF |