[arch-commits] Commit in gitlab/trunk (4 files)

[Anatol Pomozov via arch-commits]

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
===
--- PKGBUILD2020-07-21 17:06:02 UTC (rev 664757)
+++ PKGBUILD2020-07-21 18:05:26 UTC (rev 664758)
@@ -8,7 +8,7 @@
 # Contributor: Caleb Maclennan 
 
 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 
 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: Anato

[arch-commits] Commit in gitlab/trunk (4 files)

[Sven-Hendrik Haase via arch-commits]

Date: Monday, April 2, 2018 @ 01:55:18
  Author: svenstaro
Revision: 313800

upgpkg: gitlab 10.6.2-3

Modified:
  gitlab/trunk/PKGBUILD
  gitlab/trunk/gitlab-mailroom.service
  gitlab/trunk/gitlab-sidekiq.service
  gitlab/trunk/gitlab-unicorn.service

-+
 PKGBUILD|8 
 gitlab-mailroom.service |1 +
 gitlab-sidekiq.service  |1 +
 gitlab-unicorn.service  |1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-02 01:18:42 UTC (rev 313799)
+++ PKGBUILD2018-04-02 01:55:18 UTC (rev 313800)
@@ -8,7 +8,7 @@
 
 pkgname=gitlab
 pkgver=10.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-ce";
@@ -38,10 +38,10 @@
 a951b96be2862ce660dc715a364f574c2f5f72e1.patch)
 install='gitlab.install'
 
sha512sums=('c361605186a2a0cccec7167d47be458f06a0627864d58bdd77f2ebf0edf0faebedc29a908dd7116733b74be4c94825f2317ed2057d28ecd246907f4be9dc8794'
-
'c3ef56956fd0d8af1710d0c992f936c79477de35d65107eb5fde2611c65f1bf4e36a954c089a7588bac92c774e38af4581501b861decdb2193a5c08eeac92d32'
-
'cd1ae4fb5827bcace7e80db788f637a60e29666f02b642cc6fdaacb9b69910598bab2da195fe6453ed77861544d8f3e0953b0809dba58ba21c160babe2fe2a15'
+
'e91f0c8c9ab04bd34d692b11259ed2c2c312fae9d8e3978b25a4136852c00802e6a56b58bebb7d259ea5d916590d12262f97b0203548cf3048e3c254f771b69f'
+
'3d3938b67f41751d2580306d178586167c5b9a45c2fc5093abac4b0b864a520b7e96c18ef1cb17ab42b5e4f274b97917bb4a4eaf70f9f982a79137949d020a7c'
 
'bfc98f3890dfbe11a6f7fa3275f2b04b54b8e31455dcf70abfdc7f1021ff9acb1243f7af8381465346cd780bc76fa2b1c80fada860b8c3c87c7c56bb5229c1ee'
-
'a720df93dee2a4705411578e28ff00dc0af9ecdc2a7fdd11b63c533108ed6017dcbcf099604ea27599e0099d3b05e984e2549146bb8d852eaf09e33542003358'
+
'f0c2cd929f1984c71ff4c47245a86eb3123e9410b9550a62094efb18c8c2a179a58fd1d26d87fe5daa8fd0817f5d1852a7dd0d22c19c37d653f8a6d7d1c6a22b'
 
'c11d2c59da8325551a465227096e8d39b0e4bcd5b1db21565cf3439e431838c04bc00aa6f07f4d493f3f47fd6b4e25aeb0fe0fc1a05756064706bf5708c960ec'
 
'bf33b818e4ea671c16f58563997ba5fe0a09090e5c03577ff974d31324d4e9782b85a9bb4f1749b97257ce93400c692de935f003770d52b5994c9cab9aee57c6'
 
'abacbff0d7be918337a17b56481c84e6bf3eddd9551efe78ba9fb74337179e95c9b60f41c49f275e05074a4074a616be36fa208a48fc12d5b940f0554fbd89c3'

Modified: gitlab-mailroom.service
===
--- gitlab-mailroom.service 2018-04-02 01:18:42 UTC (rev 313799)
+++ gitlab-mailroom.service 2018-04-02 01:55:18 UTC (rev 313800)
@@ -15,6 +15,7 @@
 ExecStop=/usr/bin/kill -QUIT $MAINPID
 Restart=on-failure
 RestartSec=1
+StartLimitIntervalSec=100s
 
 [Install]
 WantedBy=multi-user.target

Modified: gitlab-sidekiq.service
===
--- gitlab-sidekiq.service  2018-04-02 01:18:42 UTC (rev 313799)
+++ gitlab-sidekiq.service  2018-04-02 01:55:18 UTC (rev 313800)
@@ -24,6 +24,7 @@
 ExecStop=/usr/bin/bundle-2.3 exec sidekiqctl stop /run/gitlab/sidekiq.pid
 Restart=on-failure
 RestartSec=1
+StartLimitIntervalSec=100s
 
 [Install]
 WantedBy=multi-user.target

Modified: gitlab-unicorn.service
===
--- gitlab-unicorn.service  2018-04-02 01:18:42 UTC (rev 313799)
+++ gitlab-unicorn.service  2018-04-02 01:55:18 UTC (rev 313800)
@@ -27,6 +27,7 @@
 ExecReload=/usr/bin/kill -USR2 $MAINPID
 Restart=on-failure
 RestartSec=1
+StartLimitIntervalSec=100s
 
 [Install]
 WantedBy=multi-user.target

[arch-commits] Commit in gitlab/trunk (4 files)

[Sven-Hendrik Haase]

Date: Thursday, August 25, 2016 @ 10:13:42
  Author: svenstaro
Revision: 187506

upgpkg: gitlab 8.11.0-2

use ruby 2.3

Modified:
  gitlab/trunk/gitlab-backup.service
  gitlab/trunk/gitlab-mailroom.service
  gitlab/trunk/gitlab-sidekiq.service
  gitlab/trunk/gitlab-unicorn.service

-+
 gitlab-backup.service   |4 ++--
 gitlab-mailroom.service |4 ++--
 gitlab-sidekiq.service  |6 +++---
 gitlab-unicorn.service  |4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

Modified: gitlab-backup.service
===
--- gitlab-backup.service   2016-08-25 10:06:25 UTC (rev 187505)
+++ gitlab-backup.service   2016-08-25 10:13:42 UTC (rev 187506)
@@ -9,7 +9,7 @@
 Group=gitlab
 SyslogIdentifier=gitlab-backup
 WorkingDirectory=
-Environment=RAILS_ENV=production PATH=/opt/ruby2.1/bin:/usr/bin
+Environment=RAILS_ENV=production PATH=/opt/ruby/bin:/usr/bin
 CapabilityBoundingSet=
 PrivateTmp=true
 PrivateDevices=true
@@ -16,4 +16,4 @@
 ProtectSystem=full
 ProtectHome=true
 NoNewPrivileges=true
-ExecStart=/usr/bin/bundle-2.1 exec rake gitlab:backup:create
+ExecStart=/usr/bin/bundle exec rake gitlab:backup:create

Modified: gitlab-mailroom.service
===
--- gitlab-mailroom.service 2016-08-25 10:06:25 UTC (rev 187505)
+++ gitlab-mailroom.service 2016-08-25 10:13:42 UTC (rev 187506)
@@ -8,10 +8,10 @@
 User=gitlab
 Group=gitlab
 WorkingDirectory=
-Environment=RAILS_ENV=production PATH=/opt/ruby2.1/bin:/usr/bin
+Environment=RAILS_ENV=production PATH=/opt/ruby/bin:/usr/bin
 SyslogIdentifier=gitlab-mailroom
 PIDFile=/run/gitlab/mailroom.pid
-ExecStart=/usr/bin/bundle-2.1 exec mail_room -q -c 
/config/mail_room.yml
+ExecStart=/usr/bin/bundle exec mail_room -q -c /config/mail_room.yml
 ExecStop=/usr/bin/kill -QUIT $MAINPID
 Restart=on-failure
 RestartSec=1

Modified: gitlab-sidekiq.service
===
--- gitlab-sidekiq.service  2016-08-25 10:06:25 UTC (rev 187505)
+++ gitlab-sidekiq.service  2016-08-25 10:13:42 UTC (rev 187506)
@@ -9,7 +9,7 @@
 User=gitlab
 Group=gitlab
 WorkingDirectory=
-Environment=RAILS_ENV=production PATH=/opt/ruby2.1/bin:/usr/bin
+Environment=RAILS_ENV=production PATH=/opt/ruby/bin:/usr/bin
 SyslogIdentifier=gitlab-sidekiq
 PIDFile=/run/gitlab/sidekiq.pid
 CapabilityBoundingSet=
@@ -21,8 +21,8 @@
 # use postfix' sendmail wrapper. If you use an SMTP server
 # instead you can safely enable this security feature.
 #NoNewPrivileges=true
-ExecStart=/usr/bin/bundle-2.1 exec sidekiq -q post_receive -q mailers -q 
system_hook -q incoming_email -q project_web_hook -q gitlab_shell -q common -q 
default -q archive_repo -e production
-ExecStop=/usr/bin/bundle-2.1 exec sidekiqctl stop /run/gitlab/sidekiq.pid
+ExecStart=/usr/bin/bundle exec sidekiq -q post_receive -q mailers -q 
system_hook -q incoming_email -q project_web_hook -q gitlab_shell -q common -q 
default -q archive_repo -e production
+ExecStop=/usr/bin/bundle exec sidekiqctl stop /run/gitlab/sidekiq.pid
 Restart=on-failure
 RestartSec=1
 

Modified: gitlab-unicorn.service
===
--- gitlab-unicorn.service  2016-08-25 10:06:25 UTC (rev 187505)
+++ gitlab-unicorn.service  2016-08-25 10:13:42 UTC (rev 187506)
@@ -8,7 +8,7 @@
 User=gitlab
 Group=gitlab
 WorkingDirectory=
-Environment=RAILS_ENV=production PATH=/opt/ruby2.1/bin:/usr/bin
+Environment=RAILS_ENV=production PATH=/opt/ruby/bin:/usr/bin
 SyslogIdentifier=gitlab-unicorn
 PIDFile=/run/gitlab/unicorn.pid
 RuntimeDirectory=gitlab
@@ -19,7 +19,7 @@
 ProtectSystem=full
 ProtectHome=true
 NoNewPrivileges=true
-ExecStart=/usr/bin/bundle-2.1 exec unicorn_rails -c 
/config/unicorn.rb -E production
+ExecStart=/usr/bin/bundle exec unicorn_rails -c /config/unicorn.rb -E 
production
 ExecStop=/usr/bin/kill -QUIT $MAINPID
 ExecReload=/usr/bin/kill -USR2 $MAINPID
 Restart=on-failure

[arch-commits] Commit in gitlab/trunk (4 files)

[Sven-Hendrik Haase]

Date: Tuesday, May 17, 2016 @ 22:32:56
  Author: svenstaro
Revision: 175582

upgpkg: gitlab 8.7.5-2

Add Restart=on-failure to services

Modified:
  gitlab/trunk/PKGBUILD
  gitlab/trunk/gitlab-mailroom.service
  gitlab/trunk/gitlab-sidekiq.service
  gitlab/trunk/gitlab-unicorn.service

-+
 PKGBUILD|8 
 gitlab-mailroom.service |2 ++
 gitlab-sidekiq.service  |2 ++
 gitlab-unicorn.service  |2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-17 20:22:48 UTC (rev 175581)
+++ PKGBUILD2016-05-17 20:32:56 UTC (rev 175582)
@@ -8,7 +8,7 @@
 
 pkgname=gitlab
 pkgver=8.7.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Project management and code hosting application"
 arch=('i686' 'x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-ce/tree/master#README";
@@ -43,10 +43,10 @@
 lighttpd.conf.example)
 install='gitlab.install'
 sha256sums=('170029e20425b070b1c96c0480f5a2dc09bc4bc361e487b6572f67b138d6f6cc'
-'eb507c957d4ada65bb416ff7117901d41bc77b85f5aca54e4e4400a55eefd0a7'
-'54fb165f14fdc0c186817fc3b52d99b5d74ce407a0c0312236d57fe0b729a404'
+'becafe0f9811fea69a69b8e2739857ef007f0b7e89391229f123c79c285f34f3'
+'fbe5ec709ead1729e4de85f3f036f053b2b14041c540742315ff2d63a7bdd59a'
 'd21d8c961b2834115a1d9c646278782e0d1d1cde2357b58e67bad3a58527'
-'522550aa1bda414da95136bb9d1098b48daf841674ebf9a38fe4340f81c0dc97'
+'06c9f6575ddaeb9cfb70dd9c6cc50a2e676b0aba42731d1c7793a5ba12a2d4e5'
 'e2539301fe42869d8fdbaa1b53b30076fb436c4220a37e576ed704458f804852'
 'a1ee236a1f3e65cd26d9adb5f636f66fbab68777fd60d1c796cb26036bd0903f'
 '84614a2bfbd734f09c2c91531dd3c13e795186b50c0780a120c8e5bc2a892607'

Modified: gitlab-mailroom.service
===
--- gitlab-mailroom.service 2016-05-17 20:22:48 UTC (rev 175581)
+++ gitlab-mailroom.service 2016-05-17 20:32:56 UTC (rev 175582)
@@ -13,6 +13,8 @@
 PIDFile=/run/gitlab/mailroom.pid
 ExecStart=/usr/bin/bundle-2.1 exec mail_room -q -c 
/config/mail_room.yml
 ExecStop=/usr/bin/kill -QUIT $MAINPID
+Restart=on-failure
+RestartSec=1
 
 [Install]
 WantedBy=multi-user.target

Modified: gitlab-sidekiq.service
===
--- gitlab-sidekiq.service  2016-05-17 20:22:48 UTC (rev 175581)
+++ gitlab-sidekiq.service  2016-05-17 20:32:56 UTC (rev 175582)
@@ -23,6 +23,8 @@
 #NoNewPrivileges=true
 ExecStart=/usr/bin/bundle-2.1 exec sidekiq -q post_receive -q mailers -q 
system_hook -q incoming_email -q project_web_hook -q gitlab_shell -q common -q 
default -q archive_repo -e production
 ExecStop=/usr/bin/bundle-2.1 exec sidekiqctl stop /run/gitlab/sidekiq.pid
+Restart=on-failure
+RestartSec=1
 
 [Install]
 WantedBy=multi-user.target

Modified: gitlab-unicorn.service
===
--- gitlab-unicorn.service  2016-05-17 20:22:48 UTC (rev 175581)
+++ gitlab-unicorn.service  2016-05-17 20:32:56 UTC (rev 175582)
@@ -22,6 +22,8 @@
 ExecStart=/usr/bin/bundle-2.1 exec unicorn_rails -c 
/config/unicorn.rb -E production
 ExecStop=/usr/bin/kill -QUIT $MAINPID
 ExecReload=/usr/bin/kill -USR2 $MAINPID
+Restart=on-failure
+RestartSec=1
 
 [Install]
 WantedBy=multi-user.target