commit ff9de3787fb8ef01152a7ce7cb53158406ef0fbd
Author: Elan Ruusamäe <g...@delfi.ee>
Date:   Sun Oct 23 21:54:49 2016 +0300

    up to 8.13.0 - https://about.gitlab.com/2016/10/22/gitlab-8-13-released/

 clean-vendor.sh        | 1 -
 gitlab-ce.spec         | 9 ++++-----
 gitlab-sidekiq.service | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 5e1d5d8..54862f6 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -14,12 +14,12 @@
 %bcond_with    krb5            # build with kerberos support
 %bcond_without gem_cache       # use local cache to speedup gem installation
 
-%define        shell_version 3.6.1
-%define        workhorse_version 0.8.2
+%define        shell_version 3.6.6
+%define        workhorse_version 0.8.5
 Summary:       A Web interface to create projects and repositories, manage 
access and do code reviews
 Name:          gitlab-ce
-Version:       8.12.7
-Release:       0.78
+Version:       8.13.0
+Release:       0.79
 License:       MIT
 Group:         Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -328,7 +328,6 @@ fi
 %{appdir}/.bundle
 %{appdir}/.gitlab_workhorse_secret
 %{appdir}/.ruby-version
-%{appdir}/CHANGELOG
 %{appdir}/GITLAB_SHELL_VERSION
 %{appdir}/GITLAB_WORKHORSE_VERSION
 %{appdir}/Gemfile*
diff --git a/clean-vendor.sh b/clean-vendor.sh
index b59d67b..1c526eb 100755
--- a/clean-vendor.sh
+++ b/clean-vendor.sh
@@ -29,7 +29,6 @@ clean_rootfiles() {
        rm .rubocop.yml
        rm .rubocop_todo.yml
        rm .scss-lint.yml
-       rm .vagrant_enabled
        rm Procfile
        rm bin/pkgr_before_precompile.sh
        rm docker-compose.yml
diff --git a/gitlab-sidekiq.service b/gitlab-sidekiq.service
index b30e428..154cf60 100644
--- a/gitlab-sidekiq.service
+++ b/gitlab-sidekiq.service
@@ -17,7 +17,7 @@ Environment=RAILS_ENV=production
 SyslogIdentifier=gitlab-sidekiq
 PIDFile=/var/run/gitlab/sidekiq.pid
 
-ExecStart=/usr/bin/bundle exec "sidekiq -q 
post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e 
production -P pids/sidekiq.pid -d -L log/sidekiq.log >> log/sidekiq.log 2>&1"
+ExecStart=/usr/bin/bundle exec "sidekiq -C config/sidekiq_queues.yml -e 
production -P pids/sidekiq.pid -d -L log/sidekiq.log >> log/sidekiq.log 2>&1"
 ExecStop=/usr/bin/bundle exec "sidekiqctl stop /var/run/gitlab/sidekiq.pid >> 
/var/lib/gitlab/sidekiq.log 2>&1"
 
 [Install]
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/ff9de3787fb8ef01152a7ce7cb53158406ef0fbd

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to