summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicah <micah@riseup.net>2018-01-28 08:50:41 -0800
committermicah <micah@riseup.net>2018-01-28 08:50:41 -0800
commit5d025f2a6961724fad5ea236d348e01d093ff984 (patch)
tree4f72e1f7338e7fc94f35d4b048e9353d138a61f1
parent56ad9a2596e4aeb00e9d0588cd1ca5f3988c222f (diff)
parent5b14696a3eb20d6464b2f62b38bdcebf5f589187 (diff)
Merge branch 'doc-ci' into 'master'
Document CI deploy See merge request leap/leap_se!19
-rw-r--r--README.md11
1 files changed, 6 insertions, 5 deletions
diff --git a/README.md b/README.md
index d40298c..7a1cc92 100644
--- a/README.md
+++ b/README.md
@@ -7,18 +7,19 @@ It is entirely static, but relies on a bunch of apache tricks for things like
language negotiation. A static website generator called `amber` is used to
render the source files into html files.
-To submit changes, please fork this repo and issue pull requests on github.
+To submit changes, please fork this repo and issue pull requests on [github](https://github.com/leapcode/leap_se)
+or [LEAP's gitlab instance](https://0xacab.org/leap/leap_se).
Menu changes are in the Amber subdirectory, Content and color changes are in
Pages.
For more information how to use `amber`, see:
https://github.com/leapcode/amber.
-Pushes to this repo will automatically get deployed to the website from 0xacab.org CI
-(see `.gitlab-ci.yml`).
+The 0xacab CI is setup to deploy automatically to the production website, see the
+[0xacab CI environments](https://0xacab.org/leap/leap_se/environments/15). The steps
+how this is done are configured in the [.gitlab-ci.yml](https://0xacab.org/leap/leap_se/blob/master/.gitlab-ci.yml) file.
-To deploy the current version manually (please only use in rare exceptions as the
-recommended way of deploying is to push to the repo):
+To deploy the current version manually:
sudo gem install capistrano
git clone https://leap.se/git/leap_se