Commit 935a2ae1af31d48befe9a08bbe7ae690bc55579e

Authored by Antonio Terceiro
1 parent 7631ef3d
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

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
... ... @@ -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
gitlab.spec
1 1 Name: gitlab
2 2 Version: 7.6.2
3   -Release: 2%{?dist}
  3 +Release: 3%{?dist}
4 4 Summary: Software Development Platform
5 5 Group: Development/Tools
6 6 License: Expat
7 7 URL: https://beta.softwarepublico.gov.br/gitlab/softwarepublico/gitlab
8 8 Source0: %{name}-%{version}.tar.gz
9   -Patch0: gitlab-7.5.2-jquery-ui-5.patch
10 9 BuildArch: noarch
11 10 BuildRequires: gitlab-deps
12 11 Requires: gitlab-deps, gitlab-shell, git
... ...