realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refresh patches

Browse source
This commit is contained in:
Pirate Praveen 2021-07-02 02:09:03 +05:30
parent a0e6cc2626
commit 7d872c506e
5 changed files with 9 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
debian/patches/0050-relax-stable-libs.patch vendored
View file

@ -7,8 +7,8 @@ gitlab Gemfile
source 'https://rubygems.org' source 'https://rubygems.org'
-gem 'rails', '~> 6.0.3.6' -gem 'rails', '~> 6.0.3.7'
+gem 'rails', '~> 6.0.3','>= 6.0.3.6' +gem 'rails', '~> 6.0.3','>= 6.0.3.7'
-gem 'bootsnap', '~> 1.4.6' -gem 'bootsnap', '~> 1.4.6'
+gem 'bootsnap', '~> 1.4', '>= 1.4.6' +gem 'bootsnap', '~> 1.4', '>= 1.4.6'
@ -194,9 +194,10 @@ gitlab Gemfile
gem 'commonmarker', '~> 0.21' gem 'commonmarker', '~> 0.21'
-gem 'kramdown', '~> 2.3.1' -gem 'kramdown', '~> 2.3.1'
-gem 'RedCloth', '~> 4.3.2' -gem 'RedCloth', '~> 4.3.2'
-gem 'gitlab-rdoc', '~> 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695
+gem 'kramdown', '~> 2.3','>= 2.3.1' +gem 'kramdown', '~> 2.3','>= 2.3.1'
+gem 'RedCloth', '~> 4.3', '>= 4.3.2' +gem 'RedCloth', '~> 4.3', '>= 4.3.2'
gem 'rdoc', '~> 6.1.2' +gem 'gitlab-rdoc', '~> 6.3', '>= 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695
gem 'org-ruby', '~> 0.9.12' gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0' gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1' gem 'wikicloth', '0.8.1'
@ -209,9 +210,9 @@ gitlab Gemfile
+gem 'rouge', '~> 3.26' +gem 'rouge', '~> 3.26'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
-gem 'bootstrap_form', '~> 4.2.0' -gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.11.1' -gem 'nokogiri', '~> 1.11.4'
+gem 'bootstrap_form', '~> 4.2' +gem 'bootstrap_form', '~> 4.2'
+gem 'nokogiri', '~> 1.11','>= 1.11.1' +gem 'nokogiri', '~> 1.11','>= 1.11.4'
gem 'escape_utils', '~> 1.1' gem 'escape_utils', '~> 1.1'
# Calendar rendering # Calendar rendering

4
debian/patches/0350-relax-rdoc.patch vendored
View file

@ -6,8 +6,8 @@ Allow rdoc from ruby 2.5 to match requirement
gem 'commonmarker', '~> 0.21' gem 'commonmarker', '~> 0.21'
gem 'kramdown', '~> 2.3','>= 2.3.1' gem 'kramdown', '~> 2.3','>= 2.3.1'
gem 'RedCloth', '~> 4.3', '>= 4.3.2' gem 'RedCloth', '~> 4.3', '>= 4.3.2'
-gem 'rdoc', '~> 6.1.2' -gem 'gitlab-rdoc', '~> 6.3', '>= 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695
+gem 'rdoc', '~> 6.0' +gem 'rdoc', '~> 6.0', require: 'rdoc' # See https://gitlab.com/gitlab-org/gitlab/-/issues/334695
gem 'org-ruby', '~> 0.9.12' gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0' gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1' gem 'wikicloth', '0.8.1'

2
debian/patches/0499-40-relax-rouge.patch vendored
View file

@ -11,4 +11,4 @@ rouge update is blocked by
+gem 'rouge', '~> 3.21' +gem 'rouge', '~> 3.21'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2' gem 'bootstrap_form', '~> 4.2'
gem 'nokogiri', '~> 1.11','>= 1.11.1' gem 'nokogiri', '~> 1.11','>= 1.11.4'

37
debian/patches/0810-id-upgrade-rails-to-6.0.3.7.patch vendored
View file

@ -1,37 +0,0 @@
diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb
index 20861afbb88dbdcf9b00425c1f5a5c11d16f8f98..a4b64a7848c36d7bfaf1e0f4b5bc315d8919d50b 100644
--- a/app/controllers/concerns/membership_actions.rb
+++ b/app/controllers/concerns/membership_actions.rb
@@ -108,7 +108,7 @@ def leave
respond_to do |format|
format.html do
- redirect_path = member.request? ? member.source : [:dashboard, membershipable.class.to_s.tableize]
+ redirect_path = member.request? ? member.source : [:dashboard, membershipable.class.to_s.tableize.to_sym]
redirect_to redirect_path, notice: notice
end
diff --git a/app/views/import/_githubish_status.html.haml b/app/views/import/_githubish_status.html.haml
index 4cf08b1d2bed7b4ca8a0bbc02683119246768f7f..221529a048b1ede81b3730d0186fbe8bff74af71 100644
--- a/app/views/import/_githubish_status.html.haml
+++ b/app/views/import/_githubish_status.html.haml
@@ -1,5 +1,5 @@
- add_page_specific_style 'page_bundles/import'
-- provider = local_assigns.fetch(:provider)
+- provider = local_assigns.fetch(:provider).to_sym
- extra_data = local_assigns.fetch(:extra_data, {})
- filterable = local_assigns.fetch(:filterable, true)
- paginatable = local_assigns.fetch(:paginatable, false)
diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml
index a62ed009552bb3a65d69bb3ac458f10990c0a04a..184904dd7abf5475793ee80604c65a4acc3d6ba4 100644
--- a/app/views/shared/milestones/_issuable.html.haml
+++ b/app/views/shared/milestones/_issuable.html.haml
@@ -3,7 +3,7 @@
- labels = issuable.labels
- assignees = issuable.assignees
- base_url_args = [project]
-- issuable_type_args = base_url_args + [issuable.class.table_name]
+- issuable_type_args = base_url_args + [issuable.class.table_name.to_sym]
- issuable_url_args = base_url_args + [issuable]
%li.issuable-row

1
debian/patches/series vendored
View file

@ -32,4 +32,3 @@
0750-fix-relative-paths.patch 0750-fix-relative-paths.patch
0770-remove-capybara-screenshot-rspec.patch 0770-remove-capybara-screenshot-rspec.patch
0800-search-binaries-in-path.patch 0800-search-binaries-in-path.patch
0810-id-upgrade-rails-to-6.0.3.7.patch