From 2eabb7b3e7e3b452ebf0a227eea9956dd136fff9 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mars-attacks.org>
Date: Mon, 25 Nov 2013 14:34:03 +0100
Subject: Fix bug introduced by commit 17ad237cd599702f

The gl_template option is now in the origin_config instead of
repo_config before, so we need to use the origin_config function to
access it.
---
 NEWS           | 4 ++++
 lib/MGA/Git.pm | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 73af367..3775b6e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- fix bug introduced in version 0.11, access gl_template using
+  origin_config.
+
+
 Version 0.11
 
 - soft_repo.gl: Put maintainer nick in square brackets
diff --git a/lib/MGA/Git.pm b/lib/MGA/Git.pm
index 72407c4..5e3d20e 100644
--- a/lib/MGA/Git.pm
+++ b/lib/MGA/Git.pm
@@ -170,7 +170,7 @@ sub gitolite_repo_config {
         repo_conf   => sub { repo_config($r, $repo, @_) },
         origin_conf => sub { origin_config($r, $repo, @_) },
     };
-    return process_tmpl($r->{repos}{$repo}{gl_template}, 'gl', $vars);
+    return process_tmpl(origin_config($r, $repo, 'gl_template'), 'gl', $vars);
 }
 
 sub gitolite_group_config {
-- 
cgit v1.2.1