From 58327451488c2e27b74531ebb7abd036a57ec145 Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Fri, 13 Oct 2017 14:56:09 +1100
Subject: [PATCH 1/5] Add missing </div> so that available teams is properly
 positioned

---
 pinaxcon/templates/dashboard.html | 53 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/pinaxcon/templates/dashboard.html b/pinaxcon/templates/dashboard.html
index 841b0a01..d1214fc1 100644
--- a/pinaxcon/templates/dashboard.html
+++ b/pinaxcon/templates/dashboard.html
@@ -306,33 +306,34 @@
           </div>
         {% endif %}
       </div>
-      <div class="container">
-          <div class="page-row">
-              {% if available_teams %}
-              <div class="page-header">
-                  <h3>Available Teams</h3>
-              </div>
-              <div class="page-row">
-                  {% for team in available_teams %}
-                  <div class="col-xs-12 col-sm-6 col-lg-6">
-                      <div class="panel panel-primary">
-                          <div class="panel-heading">
-                              <h5>{{ team }}</h5>
-                          </div>
-                          <div class="panel-body">
-                              {% if team.description %}<p>{{ team.description }}</p>{% endif %}
-                              <span class="label label-default">{{ team.get_access_display }}</span>
-                              <a class="btn btn-lg btn-primary" role="button" href="{% url "team_detail" team.slug %}">Details</a>
-                          </div>
-                      </div>
-                  </div>
-                  {% endfor %}
-              </div>
-              {% endif %}
-          </div>
-      </div>
-      {% endif %}
     </div>
+    <div class="container">
+      <div class="page-row">
+      {% if available_teams %}
+        <div class="page-header">
+          <h3>Available Teams</h3>
+        </div>
+        <div class="page-row">
+        {% for team in available_teams %}
+          <div class="col-xs-12 col-sm-6 col-lg-6">
+            <div class="panel panel-primary">
+              <div class="panel-heading">
+                <h5>{{ team }}</h5>
+              </div>
+              <div class="panel-body">
+              {% if team.description %}<p>{{ team.description }}</p>{% endif %}
+                <span class="label label-default">{{ team.get_access_display }}</span>
+                <a class="btn btn-lg btn-primary" role="button" href="{% url "team_detail" team.slug %}">Details</a>
+              </div>
+            </div>
+          </div>
+          {% endfor %}
+        </div>
+        {% endif %}
+      </div>
+    </div>
+    {% endif %}
+  </div>
 
 {% endblock %} <!-- block content -->
 

From dfc9c003cc669325a698144039db4ac4f258489e Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Fri, 13 Oct 2017 18:11:13 +1100
Subject: [PATCH 2/5] Update start dates for miniconfs

---
 .../symposion_proposals.json                  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fixtures/miniconf-fixtures/symposion_proposals.json b/fixtures/miniconf-fixtures/symposion_proposals.json
index e54c63d1..196509e8 100644
--- a/fixtures/miniconf-fixtures/symposion_proposals.json
+++ b/fixtures/miniconf-fixtures/symposion_proposals.json
@@ -5,7 +5,7 @@
             "end": "2017-11-30T12:59:00Z",
             "published": false,
             "section": 3,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 3
@@ -16,7 +16,7 @@
             "end": "2017-11-30T12:59:00Z",
             "published": false,
             "section": 4,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 4
@@ -27,7 +27,7 @@
             "end": "2017-11-30T12:59:00Z",
             "published": false,
             "section": 5,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 5
@@ -38,7 +38,7 @@
             "end": "2017-11-30T12:59:00Z",
             "published": false,
             "section": 6,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 6
@@ -49,7 +49,7 @@
             "end": "2017-11-29T13:01:00Z",
             "published": false,
             "section": 7,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 7
@@ -60,7 +60,7 @@
             "end": "2017-11-29T13:01:00Z",
             "published": false,
             "section": 8,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 8
@@ -71,7 +71,7 @@
             "end": "2017-11-29T13:01:00Z",
             "published": false,
             "section": 9,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 9
@@ -82,7 +82,7 @@
             "end": "2017-11-29T13:01:00Z",
             "published": false,
             "section": 10,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 10
@@ -93,7 +93,7 @@
             "end": "2017-11-29T13:01:00Z",
             "published": false,
             "section": 11,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 11
@@ -104,7 +104,7 @@
             "end": "2017-11-29T13:01:00Z",
             "published": false,
             "section": 12,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 12
@@ -115,7 +115,7 @@
             "end": "2017-11-29T13:01:00Z",
             "published": false,
             "section": 13,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 13
@@ -126,7 +126,7 @@
             "end": "2017-11-29T13:01:00Z",
             "published": false,
             "section": 14,
-            "start": "2017-11-01T14:01:00Z"
+            "start": "2017-10-15T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 14

From d7bf6d721a0ab1d8d59668e2fecac8bde531bf4f Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Fri, 13 Oct 2017 18:37:59 +1100
Subject: [PATCH 3/5] Set start/end dates for FP miniconf

https://rt.lca2018.org/Ticket/Display.html?id=510
---
 fixtures/miniconf-fixtures/symposion_proposals.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fixtures/miniconf-fixtures/symposion_proposals.json b/fixtures/miniconf-fixtures/symposion_proposals.json
index 196509e8..bcca8f83 100644
--- a/fixtures/miniconf-fixtures/symposion_proposals.json
+++ b/fixtures/miniconf-fixtures/symposion_proposals.json
@@ -68,10 +68,10 @@
     {
         "fields": {
             "closed": false,
-            "end": "2017-11-29T13:01:00Z",
+            "end": "2017-11-27T13:01:00Z",
             "published": false,
             "section": 9,
-            "start": "2017-10-15T14:01:00Z"
+            "start": "2017-10-12T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 9

From 5689fd3fced20c0c587e71ae5f5964342f1b2fd4 Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Fri, 13 Oct 2017 18:43:13 +1100
Subject: [PATCH 4/5] Open DevDevDev immediately, no close

https://rt.lca2018.org/Ticket/Display.html?id=499
---
 fixtures/miniconf-fixtures/symposion_proposals.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fixtures/miniconf-fixtures/symposion_proposals.json b/fixtures/miniconf-fixtures/symposion_proposals.json
index bcca8f83..d0c06497 100644
--- a/fixtures/miniconf-fixtures/symposion_proposals.json
+++ b/fixtures/miniconf-fixtures/symposion_proposals.json
@@ -57,10 +57,9 @@
     {
         "fields": {
             "closed": false,
-            "end": "2017-11-29T13:01:00Z",
             "published": false,
             "section": 8,
-            "start": "2017-10-15T14:01:00Z"
+            "start": "2017-10-12T14:01:00Z"
         },
         "model": "symposion_proposals.proposalsection",
         "pk": 8

From 06eae1df078ef43da472b9759b1b01a9014b51a7 Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Sat, 14 Oct 2017 10:32:46 +1100
Subject: [PATCH 5/5] Add environment labels for deploy jobs

---
 .gitlab-ci.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec9f0818..e0a97126 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,9 @@ k8s-prod-deploy:
   when: manual
   only:
   - master
+  environment:
+    name: prod
+    url: https://rego.linux.conf.au
 
 build_ticket_image:
   image: docker:git
@@ -59,6 +62,9 @@ k8s-ticket-testing-deploy:
   when: manual
   only:
   - ticket-testing
+  environment:
+    name: staging
+    url: https://ticket-testing.lca2018.org
 
 pages:
   image: alpine
@@ -74,3 +80,6 @@ pages:
     - public
   only:
   - master
+  environment:
+    name: docs
+    url: https://lca2018.gitlab.io/symposion_app/