up to 9.2.0

diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 652860793f9339a1fbaec76289a4da4af9e25a0b..a124f5057e6437351dafd4fbeb7c49b7ab0b4e02 100644 (file)
--- 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 721210c107f8fdd929f81c2a0e72fc54ee308f38..07cd338ded8a682851e2620c7f30a472c9c04b5a 100644 (file)
--- 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