From 42edcd3694192d0fb21ab47706d9fd98a98ee8ed Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sun, 7 Jul 2019 11:29:07 +0530 Subject: [PATCH] Refresh patches --- debian/patches/0050-relax-stable-libs.patch | 40 +++++++-------- debian/patches/0680-rails-5_1.patch | 22 +------- debian/patches/0730-install-graphql-tag.patch | 4 +- debian/patches/bump-devise-to-4-6.patch | 50 +++++++++---------- 4 files changed, 49 insertions(+), 67 deletions(-) diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch index 37a2f1a383..85a04ba1da 100644 --- a/debian/patches/0050-relax-stable-libs.patch +++ b/debian/patches/0050-relax-stable-libs.patch @@ -12,7 +12,7 @@ gitlab Gemfile # Improves copy-on-write performance for MRI gem 'nakayoshi_fork', '~> 0.0.4' -@@ -9,7 +9,7 @@ gem 'nakayoshi_fork', '~> 0.0.4' +@@ -9,7 +9,7 @@ # Responders respond_to and respond_with gem 'responders', '~> 2.0' @@ -21,7 +21,7 @@ gitlab Gemfile # Default values for AR models gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' -@@ -28,57 +28,57 @@ gem 'devise', '~> 4.4' +@@ -28,57 +28,57 @@ gem 'doorkeeper', '~> 4.3' gem 'doorkeeper-openid_connect', '~> 1.5' gem 'omniauth', '~> 1.8' @@ -97,7 +97,7 @@ gitlab Gemfile # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' -@@ -87,7 +87,7 @@ gem 'hashie-forbidden_attributes' +@@ -87,7 +87,7 @@ gem 'kaminari', '~> 1.0' # HAML @@ -106,7 +106,7 @@ gitlab Gemfile # Files attachments gem 'carrierwave', '~> 1.3' -@@ -97,7 +97,7 @@ gem 'mini_magick' +@@ -97,7 +97,7 @@ gem 'fog-aws', '~> 3.3' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. @@ -115,7 +115,7 @@ gitlab Gemfile gem 'fog-google', '~> 1.8' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' -@@ -111,38 +111,38 @@ gem 'google-api-client', '~> 0.23' +@@ -111,38 +111,38 @@ gem 'unf', '~> 0.1.4' # Seed data @@ -164,7 +164,7 @@ gitlab Gemfile gem 'unicorn-worker-killer', '~> 0.4.4' end -@@ -158,9 +158,9 @@ gem 'state_machines-activerecord', '~> 0.5.1' +@@ -158,9 +158,9 @@ gem 'acts-as-taggable-on', '~> 6.0' # Background jobs @@ -176,7 +176,7 @@ gitlab Gemfile gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' # Cron Parser -@@ -176,14 +176,14 @@ gem 'rainbow', '~> 3.0' +@@ -176,14 +176,14 @@ gem 'ruby-progressbar' # GitLab settings @@ -194,7 +194,7 @@ gitlab Gemfile # Export Ruby Regex to Javascript gem 'js_regex', '~> 3.1' -@@ -192,7 +192,7 @@ gem 'js_regex', '~> 3.1' +@@ -192,7 +192,7 @@ gem 'device_detector' # Cache @@ -203,7 +203,7 @@ gitlab Gemfile # Redis gem 'redis', '~> 3.2' -@@ -202,7 +202,7 @@ gem 'connection_pool', '~> 2.0' +@@ -202,7 +202,7 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration @@ -212,7 +212,7 @@ gitlab Gemfile # JIRA integration gem 'jira-ruby', '~> 1.4' -@@ -211,7 +211,7 @@ gem 'jira-ruby', '~> 1.4' +@@ -211,7 +211,7 @@ gem 'flowdock', '~> 0.7' # Slack integration @@ -221,7 +221,7 @@ gitlab Gemfile # Hangouts Chat integration gem 'hangouts-chat', '~> 0.0.5' -@@ -223,11 +223,11 @@ gem 'asana', '~> 0.8.1' +@@ -223,11 +223,11 @@ gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration @@ -235,7 +235,7 @@ gitlab Gemfile # Sanitizes SVG input gem 'loofah', '~> 2.2' -@@ -236,10 +236,10 @@ gem 'loofah', '~> 2.2' +@@ -236,10 +236,10 @@ gem 'licensee', '~> 8.9' # Protect against bruteforcing @@ -248,7 +248,7 @@ gitlab Gemfile # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.5' -@@ -257,39 +257,39 @@ gem 'chronic_duration', '~> 0.10.6' +@@ -257,39 +257,39 @@ gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' @@ -300,7 +300,7 @@ gitlab Gemfile # Metrics group :metrics do -@@ -315,54 +315,54 @@ group :development do +@@ -315,54 +315,54 @@ gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false # Better errors handler @@ -370,7 +370,7 @@ gitlab Gemfile gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.17' -@@ -371,18 +371,18 @@ group :development, :test do +@@ -371,18 +371,18 @@ gem 'stackprof', '~> 0.2.10', require: false @@ -395,7 +395,7 @@ gitlab Gemfile gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.2.5' gem 'rspec_junit_formatter' -@@ -402,11 +402,11 @@ gem 'rbtrace', '~> 0.4', require: false +@@ -402,11 +402,11 @@ gem 'oauth2', '~> 1.4' # Health check @@ -410,13 +410,13 @@ gitlab Gemfile # SSH host key support gem 'net-ssh', '~> 5.0' -@@ -419,13 +419,13 @@ group :ed25519 do +@@ -419,13 +419,13 @@ end # Gitaly GRPC client --gem 'gitaly-proto', '~> 1.19.0', require: 'gitaly' -+gem 'gitaly-proto', '~> 1.19', require: 'gitaly' - +-gem 'gitaly-proto', '~> 1.22.1', require: 'gitaly' ++gem 'gitaly-proto', '~> 1.22', '>= 1.22.1', require: 'gitaly' + -gem 'grpc', '~> 1.15.0' +gem 'grpc', '~> 1.15' diff --git a/debian/patches/0680-rails-5_1.patch b/debian/patches/0680-rails-5_1.patch index 57441b1ccf..45600354d6 100644 --- a/debian/patches/0680-rails-5_1.patch +++ b/debian/patches/0680-rails-5_1.patch @@ -316,7 +316,7 @@ Model.new.attributes now also returns encrypted attributes. acts_as_ordered_taggable -@@ -1442,7 +1442,7 @@ +@@ -1446,7 +1446,7 @@ # update visibility_level of forks def update_forks_visibility_level @@ -1957,16 +1957,7 @@ Model.new.attributes now also returns encrypted attributes. end --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb -@@ -113,7 +113,7 @@ - issues.full_search(query) - end - -- issues.reorder('updated_at DESC') -+ issues.reorder('issues.updated_at DESC') - end - # rubocop: enable CodeReuse/ActiveRecord - -@@ -123,7 +123,7 @@ +@@ -107,7 +107,7 @@ milestones = filter_milestones_by_project(milestones) @@ -1975,15 +1966,6 @@ Model.new.attributes now also returns encrypted attributes. end # rubocop: enable CodeReuse/ActiveRecord -@@ -141,7 +141,7 @@ - merge_requests.full_search(query) - end - -- merge_requests.reorder('updated_at DESC') -+ merge_requests.reorder('merge_requests.updated_at DESC') - end - # rubocop: enable CodeReuse/ActiveRecord - --- a/spec/fixtures/api/schemas/entities/issue.json +++ b/spec/fixtures/api/schemas/entities/issue.json @@ -5,7 +5,7 @@ diff --git a/debian/patches/0730-install-graphql-tag.patch b/debian/patches/0730-install-graphql-tag.patch index 03067c7964..4a2352c34b 100644 --- a/debian/patches/0730-install-graphql-tag.patch +++ b/debian/patches/0730-install-graphql-tag.patch @@ -1,8 +1,8 @@ Description: Install graphql-tag via yarnpkg Author: Utkarsh Gupta ---- gitlab-11.10.4+dfsg.orig/package.json -+++ gitlab-11.10.4+dfsg/package.json +--- a/package.json ++++ b/package.json @@ -78,6 +78,7 @@ "fuzzaldrin-plus": "^0.5.0", "glob": "^7.1.2", diff --git a/debian/patches/bump-devise-to-4-6.patch b/debian/patches/bump-devise-to-4-6.patch index 6127e0a1e4..3e6926a97a 100644 --- a/debian/patches/bump-devise-to-4-6.patch +++ b/debian/patches/bump-devise-to-4-6.patch @@ -3,9 +3,9 @@ https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28438 Author: Utkarsh Gupta --- ---- gitlab-11.10.4+dfsg.orig/Gemfile -+++ gitlab-11.10.4+dfsg/Gemfile -@@ -35,7 +35,7 @@ gem 'grape-path-helpers', '~> 1.0' +--- a/Gemfile ++++ b/Gemfile +@@ -35,7 +35,7 @@ gem 'faraday', '~> 0.12' # Authentication libraries @@ -14,9 +14,9 @@ Author: Utkarsh Gupta gem 'doorkeeper', '~> 4.3' gem 'doorkeeper-openid_connect', '~> 1.5' gem 'omniauth', '~> 1.8' ---- gitlab-11.10.4+dfsg.orig/Gemfile.lock -+++ gitlab-11.10.4+dfsg/Gemfile.lock -@@ -153,7 +153,7 @@ GEM +--- a/Gemfile.lock ++++ b/Gemfile.lock +@@ -153,7 +153,7 @@ descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) @@ -25,7 +25,7 @@ Author: Utkarsh Gupta bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) -@@ -986,7 +986,7 @@ DEPENDENCIES +@@ -986,7 +986,7 @@ database_cleaner (~> 1.7.0) deckar01-task_list (= 2.2.0) device_detector @@ -34,9 +34,9 @@ Author: Utkarsh Gupta devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) discordrb-webhooks-blackst0ne (~> 3.3) ---- gitlab-11.10.4+dfsg.orig/app/models/user.rb -+++ gitlab-11.10.4+dfsg/app/models/user.rb -@@ -1494,15 +1494,6 @@ class User < ApplicationRecord +--- a/app/models/user.rb ++++ b/app/models/user.rb +@@ -1498,15 +1498,6 @@ devise_mailer.__send__(notification, self, *args).deliver_later # rubocop:disable GitlabSecurity/PublicSend end @@ -52,8 +52,8 @@ Author: Utkarsh Gupta def ensure_user_rights_and_limits if external? self.can_create_group = false ---- gitlab-11.10.4+dfsg.orig/app/views/devise/confirmations/new.html.haml -+++ gitlab-11.10.4+dfsg/app/views/devise/confirmations/new.html.haml +--- a/app/views/devise/confirmations/new.html.haml ++++ b/app/views/devise/confirmations/new.html.haml @@ -3,7 +3,7 @@ .login-body = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: 'gl-show-field-errors' }) do |f| @@ -63,8 +63,8 @@ Author: Utkarsh Gupta .form-group = f.label :email = f.email_field :email, class: "form-control", required: true, title: 'Please provide a valid email address.' ---- gitlab-11.10.4+dfsg.orig/app/views/devise/passwords/edit.html.haml -+++ gitlab-11.10.4+dfsg/app/views/devise/passwords/edit.html.haml +--- a/app/views/devise/passwords/edit.html.haml ++++ b/app/views/devise/passwords/edit.html.haml @@ -3,7 +3,7 @@ .login-body = form_for(resource, as: resource_name, url: password_path(:user), html: { method: :put, class: 'gl-show-field-errors' }) do |f| @@ -74,8 +74,8 @@ Author: Utkarsh Gupta = f.hidden_field :reset_password_token .form-group = f.label 'New password', for: "user_password" ---- gitlab-11.10.4+dfsg.orig/app/views/devise/passwords/new.html.haml -+++ gitlab-11.10.4+dfsg/app/views/devise/passwords/new.html.haml +--- a/app/views/devise/passwords/new.html.haml ++++ b/app/views/devise/passwords/new.html.haml @@ -3,7 +3,7 @@ .login-body = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, class: 'gl-show-field-errors' }) do |f| @@ -85,8 +85,8 @@ Author: Utkarsh Gupta .form-group = f.label :email = f.email_field :email, class: "form-control", required: true, value: params[:user_email], autofocus: true, title: 'Please provide a valid email address.' ---- gitlab-11.10.4+dfsg.orig/app/views/devise/registrations/edit.html.erb -+++ gitlab-11.10.4+dfsg/app/views/devise/registrations/edit.html.erb +--- a/app/views/devise/registrations/edit.html.erb ++++ b/app/views/devise/registrations/edit.html.erb @@ -1,7 +1,7 @@

Edit <%= resource_name.to_s.humanize %>

@@ -96,8 +96,8 @@ Author: Utkarsh Gupta
<%= f.label :email %>
<%= f.email_field :email %>
---- gitlab-11.10.4+dfsg.orig/app/views/devise/shared/_signup_box.html.haml -+++ gitlab-11.10.4+dfsg/app/views/devise/shared/_signup_box.html.haml +--- a/app/views/devise/shared/_signup_box.html.haml ++++ b/app/views/devise/shared/_signup_box.html.haml @@ -2,7 +2,7 @@ .login-body = form_for(resource, as: "new_#{resource_name}", url: registration_path(resource_name), html: { class: "new_new_user gl-show-field-errors", "aria-live" => "assertive" }) do |f| @@ -107,8 +107,8 @@ Author: Utkarsh Gupta .name.form-group = f.label :name, 'Full name', class: 'label-bold' = f.text_field :name, class: "form-control top qa-new-user-name js-block-emoji", required: true, title: _("This field is required.") ---- gitlab-11.10.4+dfsg.orig/app/views/devise/unlocks/new.html.haml -+++ gitlab-11.10.4+dfsg/app/views/devise/unlocks/new.html.haml +--- a/app/views/devise/unlocks/new.html.haml ++++ b/app/views/devise/unlocks/new.html.haml @@ -3,7 +3,7 @@ .login-body = form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post, class: 'gl-show-field-errors' }) do |f| @@ -118,9 +118,9 @@ Author: Utkarsh Gupta .form-group.append-bottom-20 = f.label :email = f.email_field :email, class: 'form-control', autofocus: 'autofocus', autocapitalize: 'off', autocorrect: 'off', title: 'Please provide a valid email address.' ---- gitlab-11.10.4+dfsg.orig/config/initializers/8_devise.rb -+++ gitlab-11.10.4+dfsg/config/initializers/8_devise.rb -@@ -100,6 +100,11 @@ Devise.setup do |config| +--- a/config/initializers/8_devise.rb ++++ b/config/initializers/8_devise.rb +@@ -100,6 +100,11 @@ # secure: true in order to force SSL only cookies. # config.cookie_options = {}