Commit 848f58b2 authored by David Haynes's avatar David Haynes 🙆

Merge branch '100-front-royal' into '2.2-dev'

Add front royal campus + critical docker addition + migration tracking

Closes #100

See merge request !49
parents 91dcc369 d5b2bf79
Pipeline #3724 passed with stage
in 1 minute and 5 seconds
...@@ -18,6 +18,8 @@ services: ...@@ -18,6 +18,8 @@ services:
ports: ports:
- "8000:8000" - "8000:8000"
command: ./docker-startup.sh command: ./docker-startup.sh
volumes:
- .:/whats-open
depends_on: depends_on:
- db - db
environment: environment:
......
This diff is collapsed.
...@@ -59,6 +59,7 @@ class Location(TimeStampedModel): ...@@ -59,6 +59,7 @@ class Location(TimeStampedModel):
CAMPUS_LOCATIONS = ( CAMPUS_LOCATIONS = (
# (set in model, human readable version) # (set in model, human readable version)
("front royal", "Front Royal"),
("prince william", "Prince William County Science and Technology"), ("prince william", "Prince William County Science and Technology"),
("fairfax", "Fairfax"), ("fairfax", "Fairfax"),
("arlington", "Arlington"), ("arlington", "Arlington"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment