From f7bcf63504b956da2a09ed436f0198dd28d89b3c Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Wed, 24 Sep 2014 17:30:22 -0300
Subject: [PATCH] Updated gitlab workaround

---
 src/proxy/gitlab/diazo.xml                   |  9 +++++++++
 src/proxy/gitlab/templates/proxy/gitlab.html | 12 ++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)
 create mode 100644 src/proxy/gitlab/templates/proxy/gitlab.html

diff --git a/src/proxy/gitlab/diazo.xml b/src/proxy/gitlab/diazo.xml
index 3f57cb0..ce6210f 100644
--- a/src/proxy/gitlab/diazo.xml
+++ b/src/proxy/gitlab/diazo.xml
@@ -13,6 +13,15 @@
     <after theme-children="/html/head">
     <script>jQuery.noConflict();</script>
     <style>
+    div#main-content{
+        margin-top: 50px;
+    }
+    div#main-content div.container {
+        width: 1110px;
+    }
+    div#main-content div.flash-container{
+        width: 85%;
+    }
     #breadcrumbs {
     border: 0 !important;
     }
diff --git a/src/proxy/gitlab/templates/proxy/gitlab.html b/src/proxy/gitlab/templates/proxy/gitlab.html
new file mode 100644
index 0000000..e0732d0
--- /dev/null
+++ b/src/proxy/gitlab/templates/proxy/gitlab.html
@@ -0,0 +1,12 @@
+{% extends 'base.html' %}
+{% load static %}
+
+{% block head_js %}
+<script type="text/javascript">
+  $(function(){
+    $('div.panel-body div.automerge_widget').removeClass('hide');
+  });
+</script>
+<script type="text/javascript" src="{% static 'third-party/bootstrap/js/bootstrap.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'third-party/jquery.cookie.js' %}"></script>
+{% endblock %}
--
libgit2 0.21.2