Théo | Ailé
5b0f7ca21b
Merge branch 'skia/deploy_in_ci' into 'master'
...
gitlab-ci: deploy with Gitlab CI/CD
This MR is a proof-of-concept for deploying the Sith using Gitlab CI/CD. It leverage the CI variable to use a private key that is deployed for the `sith` user of `ae-web`. The `prod.sh` script shall do the rest.
TODO before merge:
* [x] Ensure the private key variable is protected (currently done, but may change during development to be used on this branch)
* [x] Remove this branch from the `only:refs` list
* [x] Change `test_prod.sh` for the real script
See merge request ae/Sith!293
2022-04-27 18:21:49 +00:00
Théo | Ailé
f838127730
Merge branch 'aile-master-patch-00174' into 'master'
...
Update badges and links on the readme
See merge request ae/Sith!305
2022-04-27 13:13:08 +00:00
Théo DURR
d4c0bb3b0e
Fix pipeline
...
Signed-off-by: Théo DURR <03ht@theodurr.fr >
2022-04-27 14:52:33 +02:00
Théo | Ailé
b81aee3f1c
Update badges and links
2022-04-27 09:50:38 +00:00
Théo | Ailé
7acc59f2cd
Merge branch 'lsacienne/refilling_date' into 'master'
...
Add of date in the counter/refilling_list view
I only add a new field in the counter/refilling_list view which will *normally* display the date of each refilling.
See merge request ae/Sith!302
2022-04-19 10:28:09 +00:00
Théo | Ailé
bc2fe16b74
Merge branch '117-django-2-2-not-compatible-with-psycopg-2-9' into 'master'
...
Resolve "Django 2.2 not compatible with psycopg 2.9"
Closes #117
See merge request ae/Sith!299
2022-04-18 20:21:19 +00:00
Théo | Ailé
35363d9ee7
Resolve "Django 2.2 not compatible with psycopg 2.9"
2022-04-18 20:21:18 +00:00
Théo | Ailé
52106db6fd
Merge branch '118-black-pipeline-is-broken' into 'master'
...
Resolve "Black pipeline is broken"
Closes #118
Closes #118
See merge request ae/Sith!300
2022-04-18 18:33:39 +00:00
Théo | Ailé
c4b1829e78
Resolve "Black pipeline is broken"
2022-04-18 18:33:36 +00:00
Théo | Ailé
489a9378c5
Merge branch 'poetry' into 'master'
...
Add missing dependencies and improve pipeline
* Use black version specified in requirements for checking with black
* Check if pyproject.toml file is valid at CI level
* Build documentation in CI
* Add missing postgres dependencie
See merge request ae/Sith!284
2022-03-26 21:27:22 +00:00
Théo | Ailé
928ae13a8a
Merge branch 'bugfix-113-error500' into 'master'
...
#113 : bug fixed
See merge request ae/Sith!294
2022-02-10 12:30:55 +00:00
Ailé
b20df930a2
Merge branch 'feature-111-fixture_documentation' into 'master'
...
add fixture documentation
See merge request ae/Sith!292
2021-11-25 22:06:41 +00:00
Ailé
3c1818f229
Merge branch 'family_rework' into 'master'
...
Updated text and translations to be more inclusive
See merge request ae/Sith!290
2021-11-18 15:38:13 +00:00
Ailé
d8b69e9b45
Updated text and translations to be more inclusive
2021-11-18 16:24:14 +01:00
Ailé
9177c9d4c2
Merge branch 'bugfix-110-ClubSellings' into 'master'
...
Fix error 500 in club sellings
Closes #110
See merge request ae/Sith!289
2021-11-18 14:32:11 +00:00
Ailé
5b2c70e4fb
Merge branch 'gender_options' into 'master'
...
Fix pronouns field being mandatory
See merge request ae/Sith!288
2021-11-18 09:07:21 +00:00
Ailé
b6488d1d00
Merge branch 'poor_logo_quality' into 'master'
...
Updated somo logo size where they looked blurry (we love responsive)
See merge request ae/Sith!287
2021-11-10 11:33:05 +00:00
Ailé
6a4ac336ad
Updated somo logo size where they looked blurry (we love responsive)
2021-11-10 12:11:07 +01:00
Ailé
7ac6dcf8a0
Merge branch 'family_rework' into 'master'
...
Edited the word "GodFather" to "Family"
See merge request ae/Sith!286
2021-11-10 10:35:40 +00:00
Ailé
c6a3677cc5
Fixed duplicated translation
2021-11-05 21:11:52 +01:00
Ailé
707459acd6
Changed word 'Godfather' to 'Family'
2021-11-05 21:01:19 +01:00
Ailé
6390c3320e
Applied black on migration
2021-11-05 20:40:20 +01:00
Ailé
b8aabc466c
Fixed locales
...
+Pronoun description on the user's profile
Signed-off-by: Ailé <03ht@theodurr.fr >
2021-11-05 20:28:37 +01:00
Théo DURR
c66e4232b9
Merge branch 'master' into gender_options
...
Signed-off-by: Théo DURR <03ht@theodurr.fr >
2021-11-05 17:18:17 +01:00
Ailé
336450d43f
Merge branch 'add-promo-logos' into 'master'
...
Add missing promo logos
Closes #107
See merge request ae/Sith!285
2021-10-27 10:22:07 +00:00
Théo | Ailé