Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
oser-backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hamza Touizrat
oser-backend
Commits
c2ef5eda
Commit
c2ef5eda
authored
Jun 6, 2018
by
florimondmanca
Browse files
Options
Downloads
Patches
Plain Diff
update for usage of dev branch
parent
bbbbce4d
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+1
-1
1 addition, 1 deletion
.travis.yml
README.md
+2
-2
2 additions, 2 deletions
README.md
oser_backend/settings/production.py
+1
-1
1 addition, 1 deletion
oser_backend/settings/production.py
with
4 additions
and
4 deletions
.travis.yml
+
1
−
1
View file @
c2ef5eda
...
...
@@ -40,7 +40,7 @@ deploy:
app
:
# direct each branch to the corresponding app
master
:
oser-backend
staging
:
oser-backend-
staging
dev
:
oser-backend-
dev
run
:
# automatically run new migrations
-
'
python
manage.py
migrate'
...
...
This diff is collapsed.
Click to expand it.
README.md
+
2
−
2
View file @
c2ef5eda
...
...
@@ -208,11 +208,11 @@ Vous pouvez consulter les logs publics ou accéder à l'interface sur [le site d
## Déploiement
Le backend est déployé sur Heroku dans deux applications :
staging
et production.
Le backend est déployé sur Heroku dans deux applications :
dev
et production.
### Déploiement automatique
Après un build réussi sur
`master`
ou
`
staging
`
, TravisCI provoque un nouveau déploiement sur Heroku.
Après un build réussi sur
`master`
ou
`
dev
`
, TravisCI provoque un nouveau déploiement sur Heroku.
### Accéder aux applications sur le Dashboard Heroku
...
...
This diff is collapsed.
Click to expand it.
oser_backend/settings/production.py
+
1
−
1
View file @
c2ef5eda
...
...
@@ -13,7 +13,7 @@ DEBUG = os.environ.get('DEBUG', False)
ALLOWED_HOSTS
=
[
'
localhost
'
,
'
oser-backend.herokuapp.com
'
,
'
oser-backend-
staging
.herokuapp.com
'
,
'
oser-backend-
dev
.herokuapp.com
'
,
'
oser-cs.fr
'
,
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment