Date: Tuesday, July 21, 2020 @ 18:05:26
  Author: anatolik
Revision: 664758

upgpkg: gitlab 13.2.0-1

Modified:
  gitlab/trunk/PKGBUILD
  gitlab/trunk/build_fix.patch
  gitlab/trunk/configs.patch
Deleted:
  gitlab/trunk/ruby27-pop-extra-arg.patch

----------------------------+
 PKGBUILD                   |   19 +++++--------------
 build_fix.patch            |    6 +++---
 configs.patch              |   34 +++++++++++++++++-----------------
 ruby27-pop-extra-arg.patch |   26 --------------------------
 4 files changed, 25 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-07-21 17:06:02 UTC (rev 664757)
+++ PKGBUILD    2020-07-21 18:05:26 UTC (rev 664758)
@@ -8,7 +8,7 @@
 # Contributor: Caleb Maclennan <ca...@alerque.com>
 
 pkgname=gitlab
-pkgver=13.1.4
+pkgver=13.2.0
 pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
@@ -37,12 +37,11 @@
         gitlab-backup.timer
         gitlab.target
         gitlab.tmpfiles.d
-        gitlab.logrotate
-        ruby27-pop-extra-arg.patch)
+        gitlab.logrotate)
 install='gitlab.install'
 sha512sums=('SKIP'
-            
'19c69797d268216e254f82dd9e865a70c8e79039a34b09efba42542b6e59e4d74f546be566ad923f39ed9e873273b7341619efa71ce7689d97e1a72df5677753'
-            
'9623de113358d3d6e49047f688e272d9394579734ace1bd647497e8717a90784546d27e547a29197a16c80d72ad9f2c79eb65f8edc631deadf2ec90ee86ea44b'
+            
'4fbc19b97cb9183e2f9b91a261b327262ba37dceff145ae4690ea0818dfb21175456f0ed174354b74cec0d186bb981087a1a590d51044c2a9c6034d94ee0727c'
+            
'3fc0919e2995f36da9a98fa74e83955f91854fd2e214f66f0a32054b77c83161063f8c05e1126e57e474eb0f2909970641ccc4d13eea9625f36bf56cdf0c75a4'
             
'5b1ca2958f03a5baf1c5576a1568072e8ed749e2d15745ecbcc4860d2dbd543f2f3ed077e8d87afac2670c9436b19fe498217b49916d56a4e31fb9811aeb9067'
             
'75bf9e5ad238a862dfc2638101fb74101227d88958a5f0fdf1ced3833e403f91b6a5908dfb97c5172f75748737212bf87d05b7d39bbe90ed5d3a6c248c1c1ab6'
             
'18f4a31935d0626c26d1be1942b715128cf3edcb114f672af16e4a145d8ac693e1afc7d59094cae3702e47e4c6c4cb4a62a009bafcbec500e69120a2dd400a2a'
@@ -51,8 +50,7 @@
             
'c76d634647336aaf157bc66ba094a363e971c0d275875a7df4521819147f54cd4c709eb8e024cdac9e900d99167e8a78a222587e7292e915573ef29060e6ec21'
             
'879be339148123e32b58a5669fdd3d3bb8b5d711326cb618f95b1680a6ac3a83c85d8862f2691b352fa26c95e4764dbb827856e22a3e2b9e4a76c13fe42864b5'
             
'abacbff0d7be918337a17b56481c84e6bf3eddd9551efe78ba9fb74337179e95c9b60f41c49f275e05074a4074a616be36fa208a48fc12d5b940f0554fbd89c3'
-            
'88e199d2f63e4f235930c35c6dfde80e6010e590907bd4de0af1fbfe6d5491ff56845aefcfe8edefa707712bd84fef96880655747b8bfb949ceeadc0456b0121'
-            
'0cc5c1df3cd18978df9a01bb64680d3a375c1ff4de6a453045dd26355777b4f08e3a05f55f035c8012a9683100de0bc3d11c280debcb343eb7167fc25342d5c0')
+            
'88e199d2f63e4f235930c35c6dfde80e6010e590907bd4de0af1fbfe6d5491ff56845aefcfe8edefa707712bd84fef96880655747b8bfb949ceeadc0456b0121')
 
 
 _appdir="/usr/share/webapps/gitlab" # the app source code location
@@ -100,13 +98,6 @@
   bundle config force_ruby_platform true # some native gems are not available 
for newer ruby
   bundle install --jobs=$(nproc) --no-cache --deployment --without development 
test aws kerberos
 
-  # workaround for a ruby2.7 issue
-  # https://gitlab.com/groups/gitlab-org/-/epics/2380
-  # https://github.com/ruby-grape/grape/issues/1967
-  pushd vendor/bundle/ruby/2.7.0/gems/grape-1.1.0/
-  patch -p1 < $srcdir/ruby27-pop-extra-arg.patch
-  popd
-
   yarn install --production --pure-lockfile
   bundle exec rake gitlab:assets:compile RAILS_ENV=production 
NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096"
   bundle exec rake gettext:compile RAILS_ENV=production

Modified: build_fix.patch
===================================================================
--- build_fix.patch     2020-07-21 17:06:02 UTC (rev 664757)
+++ build_fix.patch     2020-07-21 18:05:26 UTC (rev 664758)
@@ -1,4 +1,4 @@
-commit 96ff060075dc13332347c0c4d69bd4df5c6be8b7
+commit 6f719b584af4796ce794b8cc2d6e15483ad3f32d
 Author: Anatol Pomozov <anatol.pomo...@gmail.com>
 Date:   Sat Mar 21 09:13:31 2020 -0700
 
@@ -5,10 +5,10 @@
     ArchLinux fixes
 
 diff --git a/Gemfile b/Gemfile
-index 51350401807..60b49c90adf 100644
+index e0820947158..90d5a6af719 100644
 --- a/Gemfile
 +++ b/Gemfile
-@@ -310,6 +310,12 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
+@@ -315,6 +315,12 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
  gem 'gettext_i18n_rails_js', '~> 1.3'
  gem 'gettext', '~> 3.2.2', require: false, group: :development
  

Modified: configs.patch
===================================================================
--- configs.patch       2020-07-21 17:06:02 UTC (rev 664757)
+++ configs.patch       2020-07-21 18:05:26 UTC (rev 664758)
@@ -1,4 +1,4 @@
-commit c9e64ce3e8b077b5c5faa27e42dea441ef5dfd91
+commit 55143d718b2ed503faa2b302d6d246ce489c6d70
 Author: Anatol Pomozov <anatol.pomo...@gmail.com>
 Date:   Tue May 26 00:01:38 2020 -0700
 
@@ -37,7 +37,7 @@
    host: localhost
  
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 9a2e470f852..eaa3031c56f 100644
+index 7ba256b39cd..e7792d43b60 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
 @@ -83,7 +83,7 @@ production: &base
@@ -87,7 +87,7 @@
  
      # Whether to expunge (permanently remove) messages from the mailbox when 
they are deleted after delivery
      expunge_deleted: false
-@@ -209,7 +209,7 @@ production: &base
+@@ -236,7 +236,7 @@ production: &base
    artifacts:
      enabled: true
      # The location where build artifacts are stored (default: 
shared/artifacts).
@@ -96,7 +96,7 @@
      # object_store:
      #   enabled: false
      #   remote_directory: artifacts # The bucket name
-@@ -229,7 +229,7 @@ production: &base
+@@ -256,7 +256,7 @@ production: &base
      # be stored on disk, or in object storage
      enabled: false
      # The location where external diffs are stored (default: 
shared/lfs-external-diffs).
@@ -105,7 +105,7 @@
      # object_store:
      #   enabled: false
      #   remote_directory: external-diffs
-@@ -245,7 +245,7 @@ production: &base
+@@ -272,7 +272,7 @@ production: &base
    lfs:
      enabled: true
      # The location where LFS objects are stored (default: shared/lfs-objects).
@@ -114,7 +114,7 @@
      object_store:
        enabled: false
        remote_directory: lfs-objects # Bucket name
-@@ -288,7 +288,7 @@ production: &base
+@@ -315,7 +315,7 @@ production: &base
    packages:
      enabled: true
      # The location where build packages are stored (default: shared/packages).
@@ -123,7 +123,7 @@
      object_store:
        enabled: false
        remote_directory: packages # The bucket name
-@@ -309,7 +309,7 @@ production: &base
+@@ -336,7 +336,7 @@ production: &base
    dependency_proxy:
      enabled: true
      # The location where build packages are stored (default: 
shared/dependency_proxy).
@@ -132,7 +132,7 @@
      object_store:
        enabled: false
        remote_directory: dependency_proxy # The bucket name
-@@ -330,7 +330,7 @@ production: &base
+@@ -357,7 +357,7 @@ production: &base
    terraform_state:
      enabled: true
      # The location where Terraform state files are stored (default: 
shared/terraform_state).
@@ -140,8 +140,8 @@
 +    storage_path: /var/lib/gitlab/shared/terraform_state
      object_store:
        enabled: false
-       remote_directory: terraform_state # The bucket name
-@@ -349,7 +349,7 @@ production: &base
+       remote_directory: terraform # The bucket name
+@@ -376,7 +376,7 @@ production: &base
      enabled: false
      access_control: false
      # The location where pages are stored (default: shared/pages).
@@ -150,7 +150,7 @@
  
      # The domain under which the pages are served:
      # http://group.example.com/project
-@@ -363,7 +363,7 @@ production: &base
+@@ -390,7 +390,7 @@ production: &base
  
      # File that contains the shared secret key for verifying access for 
gitlab-pages.
      # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of 
the GitLab app).
@@ -159,7 +159,7 @@
  
    ## Mattermost
    ## For enabling Add to Mattermost button
-@@ -489,7 +489,7 @@ production: &base
+@@ -526,7 +526,7 @@ production: &base
      # port: 5005
      # api_url: http://localhost:5000/ # internal address to the registry, 
will be used by GitLab to directly communicate with API
      # key: config/registry.key
@@ -168,7 +168,7 @@
      # issuer: gitlab-issuer
      # notification_secret: '' # only set it when you use Geo replication 
feature without built-in Registry
  
-@@ -546,7 +546,7 @@ production: &base
+@@ -583,7 +583,7 @@ production: &base
      # add_pusher: true
  
      # The location where build traces are stored (default: builds/). Relative 
paths are relative to Rails.root
@@ -177,7 +177,7 @@
  
    #
    # 3. Auth settings
-@@ -956,12 +956,12 @@ production: &base
+@@ -993,12 +993,12 @@ production: &base
  
    # Shared file storage settings
    shared:
@@ -192,7 +192,7 @@
      # Default Gitaly authentication token. Can be overridden per storage. Can
      # be left blank when Gitaly is running locally on a Unix socket, which
      # is the normal way to deploy Gitaly.
-@@ -979,13 +979,13 @@ production: &base
+@@ -1016,13 +1016,13 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -209,7 +209,7 @@
      # archive_permissions: 0640 # Permissions for the resulting backup.tar 
file (default: 0600)
      # keep_time: 604800   # default: 0 (forever) (in seconds)
      # pg_schema: public     # default: nil, it means that all schemas will be 
backed up
-@@ -1026,12 +1026,12 @@ production: &base
+@@ -1063,12 +1063,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -225,7 +225,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1046,11 +1046,11 @@ production: &base
+@@ -1083,11 +1083,11 @@ production: &base
    workhorse:
      # File that contains the secret key for verifying access for 
gitlab-workhorse.
      # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root 
of the GitLab app).

Deleted: ruby27-pop-extra-arg.patch
===================================================================
--- ruby27-pop-extra-arg.patch  2020-07-21 17:06:02 UTC (rev 664757)
+++ ruby27-pop-extra-arg.patch  2020-07-21 18:05:26 UTC (rev 664758)
@@ -1,26 +0,0 @@
-From 9ff085264c5ce3db12290c68bc8373578234e425 Mon Sep 17 00:00:00 2001
-From: dm1try <m...@dmitry.it>
-Date: Sat, 11 Jan 2020 22:24:15 +0300
-Subject: [PATCH] fix args forwarding in Middleware::Stack#merge_with for ruby
- 2.7.0 ref #1967
-
----
- CHANGELOG.md                        | 1 +
- lib/grape/middleware/stack.rb       | 3 ++-
- spec/grape/middleware/stack_spec.rb | 9 +++++++++
- 3 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/lib/grape/middleware/stack.rb b/lib/grape/middleware/stack.rb
-index 8509a4653..488a51498 100644
---- a/lib/grape/middleware/stack.rb
-+++ b/lib/grape/middleware/stack.rb
-@@ -78,7 +78,8 @@ def use(*args, &block)
-       def merge_with(middleware_specs)
-         middleware_specs.each do |operation, *args|
-           if args.last.is_a?(Proc)
--            public_send(operation, *args, &args.pop)
-+            last_proc = args.pop
-+            public_send(operation, *args, &last_proc)
-           else
-             public_send(operation, *args)
-           end

Reply via email to