From 77faff152096c14758feaf0800036e973d699d53 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sun, 29 Jul 2018 14:53:23 -0500
Subject: [PATCH 1/7] Testing pages production

---
 .gitlab-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 011ed30..ee67021 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,8 +18,7 @@ Atheneum:Pages:
   stage: pages
   script:
   - python3 -m pip install pipenv
-  - pipenv install --dev
-  - pipenv shell
+  - pipenv install --dev --system
   - cd server/documentation
   - apt --no-cache install make
   - make html
@@ -29,5 +28,3 @@ Atheneum:Pages:
     - public
   tags:
     - docker
-  only:
-    - master

From 3e4834d25154f02416cb09d9493a3acfe25d5846 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sun, 29 Jul 2018 14:55:34 -0500
Subject: [PATCH 2/7] Adjusting gitlab-ci build script

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee67021..20ded7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,10 +17,11 @@ Atheneum:Pages:
   image: python:3.6-slim-stretch
   stage: pages
   script:
+  - apt --no-cache install make
   - python3 -m pip install pipenv
+  - cd server
   - pipenv install --dev --system
-  - cd server/documentation
-  - apt --no-cache install make
+  - cd documentation
   - make html
   - mv _build/html/ ../../public/
   artifacts:

From 3af84c76919c64b75d5deca89bd0f109af9b7541 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sun, 29 Jul 2018 14:58:07 -0500
Subject: [PATCH 3/7] Removed no-cache parameter

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20ded7f..1e07043 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ Atheneum:Pages:
   image: python:3.6-slim-stretch
   stage: pages
   script:
-  - apt --no-cache install make
+  - apt install make
   - python3 -m pip install pipenv
   - cd server
   - pipenv install --dev --system

From 2ba4061e34e4f5b6a427e01c086967cad7a36e7d Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sun, 29 Jul 2018 15:02:21 -0500
Subject: [PATCH 4/7] Removed dependency on Make

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e07043..4df7884 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,12 +17,11 @@ Atheneum:Pages:
   image: python:3.6-slim-stretch
   stage: pages
   script:
-  - apt install make
   - python3 -m pip install pipenv
   - cd server
   - pipenv install --dev --system
   - cd documentation
-  - make html
+  - sphinx-build -M html "." "_build"
   - mv _build/html/ ../../public/
   artifacts:
     paths:

From 726e5e4af3f269a934b3abbf8640ddbc38fe906d Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sun, 29 Jul 2018 15:04:47 -0500
Subject: [PATCH 5/7] Added documentation build step limit to master branch

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4df7884..3ebd2bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,3 +28,5 @@ Atheneum:Pages:
     - public
   tags:
     - docker
+  only:
+    - master

From d48b7ca87178f4bcd0b7a7f1782320af6f570baf Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sun, 29 Jul 2018 15:14:27 -0500
Subject: [PATCH 6/7] Changed build stage to deploy

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ebd2bb..313da03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 stages:
   - test
-  - pages
+  - deploy
 
 Atheneum:Tests:
   image: python:3.6-slim-stretch
@@ -15,7 +15,7 @@ Atheneum:Tests:
 
 Atheneum:Pages:
   image: python:3.6-slim-stretch
-  stage: pages
+  stage: deploy
   script:
   - python3 -m pip install pipenv
   - cd server

From 38a25aa647a2bf0d14567a764aa215e0fbdda746 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Sun, 29 Jul 2018 15:19:48 -0500
Subject: [PATCH 7/7] Adjusting jobs according to gitlab documents *
 https://docs.gitlab.com/ce/user/project/pages/getting_started_part_two.html

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 313da03..e9dbca4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
   - test
   - deploy
 
-Atheneum:Tests:
+tests:
   image: python:3.6-slim-stretch
   stage: test
   script:
@@ -13,7 +13,7 @@ Atheneum:Tests:
   tags:
     - docker
 
-Atheneum:Pages:
+pages:
   image: python:3.6-slim-stretch
   stage: deploy
   script: