diff --git a/debian/patches/0810-id-upgrade-rails-to-6.0.3.7.patch b/debian/patches/0810-id-upgrade-rails-to-6.0.3.7.patch new file mode 100644 index 0000000000..e512651b5a --- /dev/null +++ b/debian/patches/0810-id-upgrade-rails-to-6.0.3.7.patch @@ -0,0 +1,37 @@ +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 diff --git a/debian/patches/series b/debian/patches/series index 1cfebedeae..a273b4dbdf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -32,3 +32,4 @@ 0750-fix-relative-paths.patch 0770-remove-capybara-screenshot-rspec.patch 0800-search-binaries-in-path.patch +0810-id-upgrade-rails-to-6.0.3.7.patch