[packages/gitlab-ce] up to 9.2.0

glen glen at pld-linux.org
Mon Jun 19 11:21:56 CEST 2017


commit 869e18f4b14b994bd709629c24e0daaa3277ac73
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon May 22 20:42:20 2017 +0300

    up to 9.2.0

 gitlab-ce.spec | 10 +++++-----
 pld.patch      | 24 ++----------------------
 2 files changed, 7 insertions(+), 27 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 6528607..a124f50 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -14,13 +14,13 @@
 %bcond_with	krb5		# build with kerberos support
 %bcond_without	gem_cache	# use local cache to speedup gem installation
 
-%define	shell_version 5.0.2
-%define	workhorse_version 1.4.3
-%define	pages_version 0.4.1
-%define	gitaly_version 0.6.0
+%define	shell_version 5.0.3
+%define	workhorse_version 2.0.0
+%define	pages_version 0.4.2
+%define	gitaly_version 0.10.0
 Summary:	A Web interface to create projects and repositories, manage access and do code reviews
 Name:		gitlab-ce
-Version:	9.1.4
+Version:	9.2.0
 Release:	0.101
 License:	MIT
 Group:		Applications/WWW
diff --git a/pld.patch b/pld.patch
index 721210c..07cd338 100644
--- a/pld.patch
+++ b/pld.patch
@@ -50,15 +50,6 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -579,7 +582,7 @@
-     storages:
-       default:
-         path: tmp/tests/repositories/
--        gitaly_address: unix:<%= Rails.root.join('tmp/sockets/private/gitaly.socket') %>
-+        gitaly_address: unix:/var/run/gitlab/gitaly.socket
-   gitaly:
-     enabled: false
-   backup:
 --- gitlabhq-8.7.5/config/unicorn.rb	2016-05-12 17:35:19.000000000 +0300
 +++ gitlabhq-8.7.5.paths/config/unicorn.rb	2016-05-15 21:30:47.263911838 +0300
 @@ -33,12 +33,12 @@
@@ -93,8 +84,8 @@
  
  # combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
  # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
---- gitlabhq-8.7.5/config/database.yml.mysql	2016-05-12 17:35:19.000000000 +0300
-+++ gitlabhq-8.7.5/config/database.yml	2016-04-17 13:53:42.000000000 +0300
+--- gitlab-ce-9.2.0/config/database.yml.mysql~	2017-05-22 20:39:58.000000000 +0300
++++ gitlab-ce-9.2.0/config/database.yml.mysql	2017-05-22 20:40:45.379599276 +0300
 @@ -8,8 +8,8 @@
    reconnect: false
    database: gitlabhq_production
@@ -106,14 +97,3 @@
    # host: localhost
    # socket: /tmp/mysql.sock
  
-@@ -23,8 +23,8 @@
-   reconnect: false
-   database: gitlabhq_development
-   pool: 5
--  username: root
--  password: "secure password"
-+  username: mysql
-+  password: ~
-   # socket: /tmp/mysql.sock
- 
- # Warning: The database defined as "test" will be erased and
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list