[packages/gitlab-ce] pin newer rugged to fix diff view showing garbage

[glen]

commit 55a3700b89fdd43d65a7980e32406db949dfb190
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 26 00:27:22 2016 +0300

    pin newer rugged to fix diff view showing garbage
    
    https://gitlab.com/gitlab-org/gitlab-ce/issues/14972

 bug-14972.patch | 26 ++++++++++++++++++++++++++
 gitlab-ce.spec  |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 6d50bb8..aabe7dd 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -17,13 +17,14 @@
 Summary:	A Web interface to create projects and repositories, manage access and do code reviews
 Name:		gitlab-ce
 Version:	8.8.1
-Release:	0.28
+Release:	0.32
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
 Source0:	https://github.com/gitlabhq/gitlabhq/archive/v%{version}/%{name}-%{version}.tar.gz
 Patch0:		https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3774.patch
 Patch1:		pld.patch
+Patch2:		bug-14972.patch
 Source1:	gitlab.target
 Source2:	gitlab-sidekiq.service
 Source3:	gitlab-sidekiq.init
@@ -75,6 +76,7 @@ mv config/gitlab.yml.example config/gitlab.yml
 mv config/unicorn.rb.example config/unicorn.rb
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # use mysql for now
 mv config/database.yml.mysql config/database.yml
diff --git a/bug-14972.patch b/bug-14972.patch
new file mode 100644
index 0000000..7297c4a
--- /dev/null
+++ b/bug-14972.patch
@@ -0,0 +1,26 @@
+
+pin newer rugged
+https://gitlab.com/gitlab-org/gitlab-ce/issues/14972
+
+--- gitlabhq-8.8.1/Gemfile.lock~	2016-05-23 04:59:54.000000000 +0300
++++ gitlabhq-8.8.1/Gemfile.lock	2016-05-25 19:17:33.860299743 +0300
+@@ -354,7 +354,7 @@
+       activesupport (~> 4.0)
+       charlock_holmes (~> 0.7.3)
+       github-linguist (~> 4.7.0)
+-      rugged (~> 0.24.0)
++      rugged (~> 0.25.0b3)
+     gitlab_meta (7.0)
+     gitlab_omniauth-ldap (1.2.1)
+       net-ldap (~> 0.9)
+--- gitlabhq-8.8.1/Gemfile~	2016-05-23 04:59:54.000000000 +0300
++++ gitlabhq-8.8.1/Gemfile	2016-05-26 00:46:10.646707081 +0300
+@@ -53,6 +53,8 @@
+ # Extracting information from a git repository
+ # Provide access to Gitlab::Git library
+ gem "gitlab_git", '~> 10.0'
++# Pin for https://gitlab.com/gitlab-org/gitlab-ce/issues/14972
++gem "rugged", '~> 0.25.0b3'
+ 
+ # LDAP Auth
+ # GitLab fork with several improvements to original library. For full list of changes
================================================================

---- gitweb:

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