Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

001 pipeline ajitluhach #125

Open
wants to merge 7 commits into
base: test
Choose a base branch
from
+73 −72
Open

001 pipeline ajitluhach #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
64353a3
Merge pull request #110 from joatuapp/test
joatu Aug 1, 2018
7b0442f
Update serializers.py
joatu Aug 1, 2018
6230e53
Merge pull request #117 from joatuapp/test
joatu Aug 6, 2018
e1e1bd1
Revert "Test"
joatu Aug 7, 2018
166856c
Merge pull request #119 from joatuapp/revert-117-test
joatu Aug 7, 2018
1f4239f
Add Heroku generated app.json
joatu Aug 9, 2018
6a1e5bf
Update models.py
joatu Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "joatu-django",
"description": "pipeline file for joatu-test",
"scripts": {
},
"env": {
"GOOGLE_API_KEY": {
"required": true
},
"SMTP_PASSWORD": {
"required": true
}
},
"formation": {
"web": {
"quantity": 1
}
},
"addons": [
"heroku-postgresql"
],
"buildpacks": [
{
"url": "heroku/python"
}
]
}
2 changes: 1 addition & 1 deletion projects/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Project(models.Model):
('Hea_oth', 'Other activity'),
('Soc_foo', 'Food security'),
('Soc_chi', 'Childcare'),
('Soc_eld', 'Eldercare'),
('Soc_eld', 'Senior Friendly'),
('Soc_ani', 'Animalcare'),
('Soc_oth', 'Other activity'),
('Env_gar', 'Gardening'),
Expand Down
Loading