DGNum/gestioCOF
14
2
Fork 1
Code Issues 78 Pull requests 14 Projects Releases 12 Packages Wiki Activity

WIP: Aureplop/restructuring #608

Draft
delobell wants to merge 3 commits from aureplop/restructuring into master
pull from: aureplop/restructuring
merge into: DGNum:master
Conversation 9 Commits 3 Files changed 194 +495 -341
delobell commented 2018-06-17 19:53:55 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

A voir avec le setup de prod (en particulier les services).

Utilisation

# (Production)
$ git pull
# (Autres)
$ git merge --no-ff aureplop/restructuring (depuis master par exemple)

# (en supposant que les services soient dans /etc/systemd/system/,
# sinon tweak SERVICE_DAPHNE et SERVICE_WORKER dans provisioning/move_apps_helpers.sh)
$ (sudo) DJANGO_SETTINGS_MODULE="gestioCOF.settings.<env>" SERVICE_DAPHNE_FILENAME="daphne.service" SERVICE_WORKER_FILENAME="worker.service" sh provisioning/move_apps.sh

Pour tester

$ git checkout aureplop/restructuring
$ vagrant up && vagrant ssh
$ sudo bash provisioning/test_move_apps.sh (ciao la DB de Vagrant)

Pour en savoir plus, checker les nouveaux provisioning/%move_apps%.sh.

Todos

  • Rebase master /!\

Remarques

Déploiement

  • Vues SQL des mailing list : MAJ les noms de table gestioncof_... → cof_...
A voir avec le setup de prod (en particulier les services). ## Utilisation ``` # (Production) $ git pull # (Autres) $ git merge --no-ff aureplop/restructuring (depuis master par exemple) # (en supposant que les services soient dans /etc/systemd/system/, # sinon tweak SERVICE_DAPHNE et SERVICE_WORKER dans provisioning/move_apps_helpers.sh) $ (sudo) DJANGO_SETTINGS_MODULE="gestioCOF.settings.<env>" SERVICE_DAPHNE_FILENAME="daphne.service" SERVICE_WORKER_FILENAME="worker.service" sh provisioning/move_apps.sh ``` ## Pour tester ``` $ git checkout aureplop/restructuring $ vagrant up && vagrant ssh $ sudo bash provisioning/test_move_apps.sh (ciao la DB de Vagrant) ``` Pour en savoir plus, checker les nouveaux ``provisioning/%move_apps%.sh``. ## Todos - [ ] Rebase master /!\ ## Remarques ### Déploiement - [ ] Vues SQL des mailing list : MAJ les noms de table `gestioncof_...` → `cof_...`
delobell commented 2018-06-17 19:54:30 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

changed the description

changed the description
delobell commented 2018-06-30 17:48:47 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

  • 8cd73c3f - Add script for migrations

Compare with previous version

added 1 commit * 8cd73c3f - Add script for migrations [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/304/diffs?diff_id=879&start_sha=b1ba521813ee51f866c7c1bea5536904a7cb5060)
delobell commented 2018-06-30 18:24:36 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 1 commit

  • ddd6664f - Add script for migrations

Compare with previous version

added 1 commit * ddd6664f - Add script for migrations [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/304/diffs?diff_id=880&start_sha=8cd73c3fcf94dc869a48d7979c107aebd10c9779)
delobell commented 2018-09-29 16:35:37 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

changed the description

changed the description
delobell commented 2018-09-29 22:06:32 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 15 commits

  • ddd6664f...f297a1a0 - 12 commits from branch master
  • d2cd9df3 - /cof/ → /gestioCOF/ && /gestioncof/ → /cof/
  • 381b660d - Add script for migrations
  • 30061d3e - Update CI config for new tree

Compare with previous version

added 15 commits * ddd6664f...f297a1a0 - 12 commits from branch `master` * d2cd9df3 - &#x2F;cof&#x2F; → &#x2F;gestioCOF&#x2F; &amp;&amp; &#x2F;gestioncof&#x2F; → &#x2F;cof&#x2F; * 381b660d - Add script for migrations * 30061d3e - Update CI config for new tree [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/304/diffs?diff_id=919&start_sha=ddd6664fa0174afc600f4ffc7be44d40ef28e361)
delobell commented 2018-09-29 22:14:41 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added 3 commits

  • c297c7b5 - /cof/ → /gestioCOF/ && /gestioncof/ → /cof/
  • bb2868a5 - Add script for migrations
  • 86fc8778 - Update CI config for new tree

Compare with previous version

added 3 commits * c297c7b5 - &#x2F;cof&#x2F; → &#x2F;gestioCOF&#x2F; &amp;&amp; &#x2F;gestioncof&#x2F; → &#x2F;cof&#x2F; * bb2868a5 - Add script for migrations * 86fc8778 - Update CI config for new tree [Compare with previous version](https://git.eleves.ens.fr/cof-geek/gestioCOF/merge_requests/304/diffs?diff_id=920&start_sha=30061d3e18e419c57098174455641a47653139bb)
delobell commented 2018-09-30 14:44:17 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

added ~62 ~30 ~28 labels

added ~62 ~30 ~28 labels
mpepin commented 2018-10-04 19:01:35 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

penser aux vues sql

penser aux vues sql
delobell commented 2018-10-06 17:53:30 +02:00 (Migrated from git.eleves.ens.fr)
Copy link

changed the description

changed the description
This pull request has changes conflicting with the target branch.
  • .gitlab-ci.yml
  • bda/management/commands/loadbdadevdata.py
  • bda/tests/test_models.py
  • bda/urls.py
  • bda/views.py
  • cof/__init__.py
  • cof/urls.py
  • gestioncof/__init__.py
  • gestioncof/admin.py
  • gestioncof/apps.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin aureplop/restructuring:aureplop/restructuring
git checkout aureplop/restructuring

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff aureplop/restructuring
git checkout master
git merge --ff-only aureplop/restructuring
git checkout aureplop/restructuring
git rebase master
git checkout master
git merge --no-ff aureplop/restructuring
git checkout master
git merge --squash aureplop/restructuring
git checkout master
git merge --ff-only aureplop/restructuring
git checkout master
git merge aureplop/restructuring
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
devtype -- backend

Au programme : du Python, du Django...

  
devtype -- docs

   
devtype -- frontend

   
devtype -- user interface

Au programme : templating, JS, CSS...

  
difficulty -- easy

   
difficulty -- hard

Difficile et/ou risqué

  
difficulty -- normal

   
Doing

   
domain -- bda

Concerne l'application BdA

  
domain -- bds

   
domain -- cof

Concerne l'application COF

  
domain -- core

Dépendances externes, CI, linting...

  
domain -- kfet

Concerne l'application K-Fêt

  
Good first issue

   
priority -- high

Urgent quoi

  
priority -- low

   
priority -- medium

   
priority -- staff-wanted

L'équipe dirigeante du domaine en question souhaite cette fonctionnalité.

  
status -- development

En cours de développement

  
status -- discussion

Avant de coder, c'est bien de discuter

  
status -- need review

En attente de code review

  
status -- production

L'ajout/la modification est présente en production

  
status -- ready to merge

Plus qu'à merger !

  
status -- todo

Le développement devrait bientôt commencer

  
To Do

   
type -- bug

Signalement ou correction de bug

  
type -- hygiene

Tout ce qui amène à du code plus propre et un repo mieux organisé.

  
type -- improvement

Ajout/Demande d'évolution mineure d'une fonctionnalité existante

  
type -- new feature

Ajout/Demande d'une nouvelle fonctionnalité

No labels
devtype -- backend
devtype -- docs
devtype -- frontend
devtype -- user interface
difficulty -- easy
difficulty -- hard
difficulty -- normal
Doing
domain -- bda
domain -- bds
domain -- cof
domain -- core
domain -- kfet
Good first issue
priority -- high
priority -- low
priority -- medium
priority -- staff-wanted
status -- development
status -- discussion
status -- need review
status -- production
status -- ready to merge
status -- todo
To Do
type -- bug
type -- hygiene
type -- improvement
type -- new feature
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: DGNum/gestioCOF#608
No description provided.
Delete branch "aureplop/restructuring"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?