From c77b677e41e7b319c6d706332f64dc8de70892a8 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 3 Nov 2019 20:05:04 -0400 Subject: [PATCH 1/4] Fix release push command Signed-off-by: Roberto Rosario --- docs/chapters/development.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/chapters/development.rst b/docs/chapters/development.rst index 7ef7b76583..f9ec75c8fe 100644 --- a/docs/chapters/development.rst +++ b/docs/chapters/development.rst @@ -538,7 +538,7 @@ Release using GitLab CI #. Push the current branch to the corresponding origin ``releases/`` branch: :: - git push origin releases/ + git push origin :releases/ #. Push the new tags: From 52e75599388777a1af8c8e27fd1975076c9eb21e Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 3 Nov 2019 21:26:59 -0400 Subject: [PATCH 2/4] Update format of v3.2.9 release notes Signed-off-by: Roberto Rosario --- docs/releases/3.2.9.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/releases/3.2.9.rst b/docs/releases/3.2.9.rst index 343ea7d804..1fd2852e9e 100644 --- a/docs/releases/3.2.9.rst +++ b/docs/releases/3.2.9.rst @@ -24,6 +24,10 @@ Dependencies The help message of the ``--context`` option of the ``platformtemplate`` command was fixed to say "YAML" instead of "JSON". +The Celery and Django Celery dependencies were moved to the task +manager app. + +Some dependecies were updated to a new version: - Update Django to version 1.11.25. - Update PyYAML to version 5.1.2. @@ -32,8 +36,6 @@ command was fixed to say "YAML" instead of "JSON". - Update pathlib2 to version 2.3.5. - Update whitenoise to version 4.1.4. - Update Pillow to version 6.2.1. -- Move Celery and Django Celery dependencies - to the task manager app. Docker From 0fdb59b8113242245ddf01f423d2d1c3586a24c1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 3 Nov 2019 21:31:43 -0400 Subject: [PATCH 3/4] Fix typo Signed-off-by: Roberto Rosario --- docs/releases/3.2.9.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/releases/3.2.9.rst b/docs/releases/3.2.9.rst index 1fd2852e9e..8a9f665e60 100644 --- a/docs/releases/3.2.9.rst +++ b/docs/releases/3.2.9.rst @@ -27,7 +27,7 @@ command was fixed to say "YAML" instead of "JSON". The Celery and Django Celery dependencies were moved to the task manager app. -Some dependecies were updated to a new version: +Some dependencies were updated to a new version: - Update Django to version 1.11.25. - Update PyYAML to version 5.1.2. From ee426282dbe1ed9a8489618e5b015f0cdd631646 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 3 Nov 2019 23:12:46 -0400 Subject: [PATCH 4/4] Add missing closed issued to release notes Signed-off-by: Roberto Rosario --- docs/releases/3.2.9.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/releases/3.2.9.rst b/docs/releases/3.2.9.rst index 8a9f665e60..1b2b945676 100644 --- a/docs/releases/3.2.9.rst +++ b/docs/releases/3.2.9.rst @@ -216,8 +216,11 @@ Backward incompatible changes Bugs fixed or issues closed --------------------------- +- :gitlab-issue:`659` GitLab config: '.gitlab-ci.yml' does not specify the + exact version of all dependencies - :gitlab-issue:`676` Access fuse mounted index via samba -- :gitlab-issue:`671` [Docker] MAYAN_GUNICORN_TIMEOUT timeout not passed to worker +- :gitlab-issue:`671` [Docker] MAYAN_GUNICORN_TIMEOUT timeout not passed + to worker - :gitlab-issue:`677` Django start before PostgreSQL is up. - :forum-topic:`1347` Workflow state action: perform a POST request