Commits · 29e9cd2bc1b681d7a9885e86e8135ef23a409c28 · UCC / uccportal

24 Feb, 2019 37 commits
- Merge branch 'coffee-testing' into 'master' · 29e9cd2b
  Zack Wong authored Feb 24, 2019
```
Coffee testing

See merge request frekk/uccportal!6
```
  29e9cd2b
- Merge branch 'master' into 'coffee-testing' · ab27586a
  Zack Wong authored Feb 24, 2019
```
# Conflicts:
#   .gitlab-ci.yml
```
  ab27586a
- change watermark position · d6613604
  Zack Wong authored Feb 24, 2019
  
  d6613604
- fix tabs to spaces · 57d48fe4
  Zack Wong authored Feb 24, 2019
  
  57d48fe4
- added environment watermark · 0e5f40d1
  Zack Wong authored Feb 24, 2019
  
  0e5f40d1
- Merge branch 'master' of gitlab.ucc.asn.au:frekk/uccportal · f7eae603
  Zack Wong authored Feb 24, 2019
  
  f7eae603
- fix stage url · 89955efc
  Zack Wong authored Feb 24, 2019
  
  89955efc
- Merge branch 'coffee-testing' into 'master' · 68ec132a
  Zack Wong authored Feb 24, 2019
```
set permissions on config

See merge request frekk/uccportal!5
```
  68ec132a
- set permissions on config · 24eb3ce4
  Zack Wong authored Feb 24, 2019
  
  24eb3ce4
- Update .gitlab-ci.yml · 54e3e668
  Zack Wong authored Feb 24, 2019
  
  54e3e668
- Update .gitlab-ci.yml · 4cea170d
  Zack Wong authored Feb 24, 2019
  
  4cea170d
- make stage more prod like · 0944a8f7
  Zack Wong authored Feb 24, 2019
  
  0944a8f7
- Merge branch 'coffee-testing' into 'master' · a99227c9
  Zack Wong authored Feb 24, 2019
```
Coffee testing

See merge request frekk/uccportal!4
```
  a99227c9
- Update .gitlab-ci.yml · 4df5f28f
  Zack Wong authored Feb 24, 2019
  
  4df5f28f
- fix tests · 0a469c0b
  Zack Wong authored Feb 24, 2019
  
  0a469c0b
- Update .gitlab-ci.yml · 0f2a783d
  Zack Wong authored Feb 24, 2019
  
  0f2a783d
- Update .gitlab-ci.yml · cbbdb82a
  Zack Wong authored Feb 24, 2019
  
  cbbdb82a
- remove double definition of ALLOWED_HOSTS · 7dc40eb3
  Zack Wong authored Feb 24, 2019
  
  7dc40eb3
- Update .gitlab-ci.yml · 58d48d56
  Zack Wong authored Feb 24, 2019
  
  58d48d56
- fix ci config · 73910179
  Zack Wong authored Feb 24, 2019
  
  73910179
- set deployment host name · 48d61858
  Zack Wong authored Feb 24, 2019
  
  48d61858
- Merge branch 'coffee-testing' of gitlab.ucc.asn.au:frekk/uccportal into coffee-testing · 13a47705
  Zack Wong authored Feb 24, 2019
  
  13a47705
- update pip-packages.txt · b6854d68
  Zack Wong authored Feb 24, 2019
  
  b6854d68
- fix testing db · 625ba170
  Zack Wong authored Feb 24, 2019
  
  625ba170
- add db variables · 210190aa
  Zack Wong authored Feb 24, 2019
  
  210190aa
- Merge branch 'coffee-testing' of gitlab.ucc.asn.au:frekk/uccportal into coffee-testing · df020d38
  Zack Wong authored Feb 24, 2019
  
  df020d38
- fix config variables · dc4510da
  Zack Wong authored Feb 24, 2019
  
  dc4510da
- enable ci debug · 5f40687c
  Zack Wong authored Feb 24, 2019
  
  5f40687c
- fix symlink · 13b4f90a
  Zack Wong authored Feb 24, 2019
  
  13b4f90a
- make settings_local use variable substitutions · b0c09560
  Zack Wong authored Feb 24, 2019
  
  b0c09560
- Update .gitlab-ci.yml · 8c578aab
  Zack Wong authored Feb 24, 2019
  
  8c578aab
- Update .gitlab-ci.yml · 2c8af235
  Zack Wong authored Feb 24, 2019
  
  2c8af235
- remove redundant script cmd · 8f0ebc63
  Zack Wong authored Feb 24, 2019
  
  8f0ebc63
- make ci use python 3 · 7128f426
  Zack Wong authored Feb 24, 2019
  
  7128f426
- add runner tag · bfc46786
  Zack Wong authored Feb 24, 2019
  
  bfc46786
- Fix ci syntax · 17a940a4
  Zack Wong authored Feb 24, 2019
  
  17a940a4
- fix indents · 02ea6563
  Zack Wong authored Feb 24, 2019
  
  02ea6563
23 Feb, 2019 3 commits
- Merge branch 'coffee-testing' into 'master' · 2ef6cad7
  Zack Wong authored Feb 23, 2019
```
Coffee testing

See merge request frekk/uccportal!3
```
  2ef6cad7
- implement test env deployment · 452e67d9
  Zack Wong authored Feb 23, 2019
  
  452e67d9
- refined ci files · f43f8393
  Zack Wong authored Feb 23, 2019
  
  f43f8393