[DRE-commits] [gitlab] 01/03: allow minor updates

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit a400c3c7825b749b4d18161c505037b48d26568d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Jun 12 12:50:18 2016 +0530

    allow minor updates
---
 debian/changelog                                 |  6 ++++++
 debian/patches/0051-allow-stable-minor-8.9.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ac40436..404a106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gitlab (8.8.2+dfsg-4) UNRELEASED; urgency=high
+
+  * Allow minor updates for ruby-state-machines-activerecord (Closes: #827013)
+
+ -- Pirate Praveen <praveen at debian.org>  Sun, 12 Jun 2016 12:48:36 +0530
+
 gitlab (8.8.2+dfsg-3) unstable; urgency=medium
 
   * Update minimum version of rails to 4.2.6
diff --git a/debian/patches/0051-allow-stable-minor-8.9.patch b/debian/patches/0051-allow-stable-minor-8.9.patch
new file mode 100644
index 0000000..8ae2366
--- /dev/null
+++ b/debian/patches/0051-allow-stable-minor-8.9.patch
@@ -0,0 +1,24 @@
+relax minor updates for 8.9 (fix #827013)
+
+Index: gitlab/Gemfile
+===================================================================
+--- gitlab.orig/Gemfile
++++ gitlab/Gemfile
+@@ -105,7 +105,7 @@ gem 'org-ruby',      '~> 0.9.12'
+ gem 'creole',        '~> 0.5.0'
+ gem 'wikicloth',     '0.8.1'
+ gem 'asciidoctor',   '~> 1.5.2'
+-gem 'rouge',         '~> 1.10.1'
++gem 'rouge',         '~> 1.10'
+ 
+ # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
+ # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
+@@ -121,7 +121,7 @@ group :unicorn do
+ end
+ 
+ # State machine
+-gem "state_machines-activerecord", '~> 0.3.0'
++gem "state_machines-activerecord", '~> 0.4.0'
+ # Run events after state machine commits
+ gem 'after_commit_queue'
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a83ee26..c69477a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
 0018-loosen-rdoc.patch
 0042-relax-grape-entity.patch
 0050-relax-stable-libs.patch
+0051-allow-stable-minor-8.9.patch
 0100-remove-development-test.patch
 0108-make-mysql-optional.patch
 source-init-functions.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git