Revert "testing"

This reverts commit 7554c1e7e8

.gitlab-ci.yml

@@ -91,8 +91,8 @@ publish:
   services:
     - docker:25-dind
   only:
-    - main
+    - develop
-    - production
+    - master
   script:
     - docker info
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -103,7 +103,7 @@ deploy:dev:
   image: docker:25-cli
   stage: deploy
   only:
-    - main
+    - develop
   environment:
     name: dev
     url: http://api.dev.sahkoinsinoorikilta.fi
@@ -125,7 +125,7 @@ deploy:production:
   stage: deploy
   image: docker:25-cli
   only:
-    - production
+    - master
   environment:
     name: production
     url: https://api.sahkoinsinoorikilta.fi

README.md

@@ -15,6 +15,7 @@ Set up your SSH key authentication in GitLab Profile Settings. Then clone the re
 ```bash
 git clone git@gitlab.com:sahkoinsinoorikilta/vtmk/web2.0-backend.git
 cd web2.0-backend
+git checkout develop
 ```
 
 Copy env file for local use:
@@ -108,11 +109,11 @@ Example of creating a feature branch:
 git checkout -b feature-branch-name
 ```
 
-When your changes are ready and the code works without errors, submit a merge request to `main` in GitLab.  Another developer reviews your changes and runs the merge. Feature branches should be closed on merge.
+When your changes are ready and the code works without errors, submit a merge request to `develop` in GitLab.  Another developer reviews your changes and runs the merge. Feature branches should be closed on merge.
 
-Bugfixes do not need their own feature branches and can be pushed straight to `main`, but if the fix needs a notable amount of work, it should be done in a `bugfix` branch instead.
+Bugfixes do not need their own feature branches and can be pushed straight to `develop`, but if the fix needs a notable amount of work, it should be done in a `bugfix` branch instead.
 
-Merge requests to `main` should be reviewed by multiple developers. Only a moderator can accept merge requests to `production`.
+Merge requests to `master` should be reviewed by multiple developers. Only a moderator can accept merge requests to `master`.
 
 ### Linting
 
@@ -152,4 +153,4 @@ For more information about deployment check **[infra](https://gitlab.com/sahkoin
 
 ## GitLab CI
 
-All pushed changes go through the GitLab Continuous Integration, which consists of automated unit testing and linting. Make sure your changes pass both before merging to `main` or `production`.
+All pushed changes go through the GitLab Continuous Integration, which consists of automated unit testing and linting. Make sure your changes pass both before merging to `develop` or `master`.

templates/kaehmy/kaehmy.html

@@ -28,7 +28,6 @@
         </p>
         <h5>{% trans "Päivämääriä & deadlineja" %}</h5>
         <ul>
-            <li><strong>11.10.</strong> {% blocktrans %}Toimikuntablää$t @Kiltis{% endblocktrans %}</li>
             <li><strong>23.10.</strong> {% blocktrans %}Deadline hallitusvirkoihin hakemiselle.{% endblocktrans %}</li>
             <li><strong>24.10.</strong> {% blocktrans %}Vaalikokous, osa 1 (puheenjohtajan valinta) ja hallitustyrkkypaneeli{% endblocktrans %}</li>
             <li><strong>6.11.</strong> {% blocktrans %}Vaalikokous, osa 2 (hallituksen ja toimikuntien puheenjohtajien valinta){% endblocktrans %}</li>
@@ -81,11 +80,6 @@
                 {% endblocktrans %}
             </span>
             <br>
-            <input type="checkbox" name="kaehmybot" value="1" checked>
-            <span>{% blocktrans %}
-                Kähmybot saa lähettää hakemuksestani ilmoituksen killan telegramiin (hallitusvirkoihin hakiessa valitse kyllä).
-                {% endblocktrans %}
-            </span>
             {% buttons %}
             <button type="submit" class="btn btn-primary">
                 {% trans "Submit" %}