From 36625ed64363244ee415497590852178f90d2e67 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 03 2018 11:13:39 +0000
Subject: [PATCH 1/2] Fix checking if the user is authenticated


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/template/repo_info.html b/template/repo_info.html
index aac5798..f6cdaaf 100644
--- a/template/repo_info.html
+++ b/template/repo_info.html
@@ -48,7 +48,7 @@
 
 {% block repo %}
 
-  {% if authenticated and g.repo_committer and not repo.is_fork
+  {% if g.authenticated and g.repo_committer and not repo.is_fork
       and not repo.settings.get('pull_requests', True) and not readme %}
     <div class="row">
       <div class="col-md-8">
@@ -72,7 +72,7 @@
       <div class="col-md-8">
         <div class="alert {% if category == 'error' %}alert-warning{% else %}alert-info{%endif%}" role="alert">
           <p>This repo is brand new!</p>
-            {% if authenticated and g.repo_committer %}
+            {% if g.authenticated and g.repo_committer %}
               <p>If you already have a git repo:</p>
               <pre>git remote add origin {{ config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
 git push -u origin master</pre>
@@ -247,7 +247,7 @@ git push -u origin master</pre>
               {% endfor %}
             </div>
             <h5><strong>Source GIT URLs</strong>{% if
-              (authenticated and g.repo_committer) or
+              (g.authenticated and g.repo_committer) or
               (config['DOC_APP_URL'] and repo and
                       repo.settings.get('project_documentation', True))
               %}
@@ -255,7 +255,7 @@ git push -u origin master</pre>
                   aria-expanded="false" aria-controls="moregiturls"
                   id="more_gits">more</a></span>{%endif%}</h5>
             <div>
-              {% if authenticated and g.repo_committer %}
+              {% if g.authenticated and g.repo_committer %}
               <div class="form-group">
                 <div class="input-group input-group-sm">
                   <div class="input-group-addon">SSH</div>
@@ -276,7 +276,7 @@ git push -u origin master</pre>
                     and repo
                     and repo.settings.get('project_documentation', True) %}
                   <h5><strong>Docs GIT URLs</strong></h5>
-                  {% if authenticated and g.repo_committer %}
+                  {% if g.authenticated and g.repo_committer %}
                     <div class="form-group">
                       <div class="input-group input-group-sm">
                         <div class="input-group-addon">SSH</div>
@@ -293,7 +293,7 @@ git push -u origin master</pre>
                     </div>
                   </div>
                 {% endif %}
-                {% if authenticated and g.repo_committer %}
+                {% if g.authenticated and g.repo_committer %}
                   {% if config.get('ENABLE_TICKETS', True)
                      and repo.settings.get('issue_tracker', True) %}
                     <h5><strong>Issues GIT URLs</strong></h5>

From 59bf93a74ee7a18440a260a95776afb16fa3dcae Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 03 2018 11:16:59 +0000
Subject: [PATCH 2/2] Move the git URLs at the top of the column as done upstream


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/template/repo_info.html b/template/repo_info.html
index f6cdaaf..860eed9 100644
--- a/template/repo_info.html
+++ b/template/repo_info.html
@@ -148,6 +148,76 @@ git push -u origin master</pre>
       <div class="col-md-4">
         <div class="card">
           <div class="card-block">
+            <h5><strong>Source GIT URLs</strong>{% if
+              (g.authenticated and g.repo_committer) or
+              (config['DOC_APP_URL'] and repo and
+                      repo.settings.get('project_documentation', True))
+              %}
+                  <span class="pull-xs-right"><a data-toggle="collapse" href="#moregiturls"
+                  aria-expanded="false" aria-controls="moregiturls"
+                  id="more_gits">more</a></span>{%endif%}</h5>
+            <div>
+              {% if g.authenticated and g.repo_committer %}
+              <div class="form-group">
+                <div class="input-group input-group-sm">
+                  <div class="input-group-addon">SSH</div>
+                  <input class="form-control" type="text" value="{{
+                    git_url_ssh }}{{ repo.fullname }}.git" readonly>
+                </div>
+              </div>
+              {% endif %}
+              <div class="form-group">
+                <div class="input-group input-group-sm">
+                  <div class="input-group-addon">GIT</div>
+                  <input class="form-control" type="text" value="{{
+                    config.get('GIT_URL_GIT') }}{{ repo.fullname }}.git" readonly>
+                </div>
+              </div>
+              <div class="collapse" id="moregiturls">
+                {% if config['DOC_APP_URL']
+                    and repo
+                    and repo.settings.get('project_documentation', True) %}
+                  <h5><strong>Docs GIT URLs</strong></h5>
+                  {% if g.authenticated and g.repo_committer %}
+                    <div class="form-group">
+                      <div class="input-group input-group-sm">
+                        <div class="input-group-addon">SSH</div>
+                        <input class="form-control" type="text" value="{{
+                          git_url_ssh }}docs/{{ repo.fullname }}.git" readonly>
+                      </div>
+                    </div>
+                  {% endif %}
+                  <div class="form-group">
+                    <div class="input-group input-group-sm">
+                      <div class="input-group-addon">GIT</div>
+                      <input class="form-control" type="text" value="{{
+                        config.get('GIT_URL_GIT') }}docs/{{ repo.fullname }}.git" readonly>
+                    </div>
+                  </div>
+                {% endif %}
+                {% if g.authenticated and g.repo_committer %}
+                  {% if config.get('ENABLE_TICKETS', True)
+                     and repo.settings.get('issue_tracker', True) %}
+                    <h5><strong>Issues GIT URLs</strong></h5>
+                    <div class="form-group">
+                      <div class="input-group input-group-sm">
+                        <div class="input-group-addon">SSH</div>
+                        <input class="form-control" type="text" value="{{
+                          git_url_ssh }}tickets/{{ repo.fullname }}.git" readonly>
+                      </div>
+                    </div>
+                  {% endif %}
+                  <h5><strong>Pull Requests GIT URLs</strong></h5>
+                  <div class="form-group">
+                    <div class="input-group input-group-sm">
+                      <div class="input-group-addon">SSH</div>
+                      <input class="form-control" type="text" value="{{
+                        git_url_ssh }}requests/{{ repo.fullname }}.git" readonly>
+                    </div>
+                  </div>
+                {% endif %}
+              </div>
+            </div>
             <h5><strong>Contributors</strong></h5>
             <div class="m-b-2">
               <div>
@@ -246,76 +316,6 @@ git push -u origin master</pre>
               </div>
               {% endfor %}
             </div>
-            <h5><strong>Source GIT URLs</strong>{% if
-              (g.authenticated and g.repo_committer) or
-              (config['DOC_APP_URL'] and repo and
-                      repo.settings.get('project_documentation', True))
-              %}
-                  <span class="pull-xs-right"><a data-toggle="collapse" href="#moregiturls"
-                  aria-expanded="false" aria-controls="moregiturls"
-                  id="more_gits">more</a></span>{%endif%}</h5>
-            <div>
-              {% if g.authenticated and g.repo_committer %}
-              <div class="form-group">
-                <div class="input-group input-group-sm">
-                  <div class="input-group-addon">SSH</div>
-                  <input class="form-control" type="text" value="{{
-                    git_url_ssh }}{{ repo.fullname }}.git" readonly>
-                </div>
-              </div>
-              {% endif %}
-              <div class="form-group">
-                <div class="input-group input-group-sm">
-                  <div class="input-group-addon">GIT</div>
-                  <input class="form-control" type="text" value="{{
-                    config.get('GIT_URL_GIT') }}{{ repo.fullname }}.git" readonly>
-                </div>
-              </div>
-              <div class="collapse" id="moregiturls">
-                {% if config['DOC_APP_URL']
-                    and repo
-                    and repo.settings.get('project_documentation', True) %}
-                  <h5><strong>Docs GIT URLs</strong></h5>
-                  {% if g.authenticated and g.repo_committer %}
-                    <div class="form-group">
-                      <div class="input-group input-group-sm">
-                        <div class="input-group-addon">SSH</div>
-                        <input class="form-control" type="text" value="{{
-                          git_url_ssh }}docs/{{ repo.fullname }}.git" readonly>
-                      </div>
-                    </div>
-                  {% endif %}
-                  <div class="form-group">
-                    <div class="input-group input-group-sm">
-                      <div class="input-group-addon">GIT</div>
-                      <input class="form-control" type="text" value="{{
-                        config.get('GIT_URL_GIT') }}docs/{{ repo.fullname }}.git" readonly>
-                    </div>
-                  </div>
-                {% endif %}
-                {% if g.authenticated and g.repo_committer %}
-                  {% if config.get('ENABLE_TICKETS', True)
-                     and repo.settings.get('issue_tracker', True) %}
-                    <h5><strong>Issues GIT URLs</strong></h5>
-                    <div class="form-group">
-                      <div class="input-group input-group-sm">
-                        <div class="input-group-addon">SSH</div>
-                        <input class="form-control" type="text" value="{{
-                          git_url_ssh }}tickets/{{ repo.fullname }}.git" readonly>
-                      </div>
-                    </div>
-                  {% endif %}
-                  <h5><strong>Pull Requests GIT URLs</strong></h5>
-                  <div class="form-group">
-                    <div class="input-group input-group-sm">
-                      <div class="input-group-addon">SSH</div>
-                      <input class="form-control" type="text" value="{{
-                        git_url_ssh }}requests/{{ repo.fullname }}.git" readonly>
-                    </div>
-                  </div>
-                {% endif %}
-              </div>
-            </div>
           </div>
           <div class="repo_date" title="{{repo.date_created}}">
               created {{repo.date_created|humanize}}