Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fast-forward master branch to where develop branch is #307

Merged
merged 7 commits into from
Feb 23, 2024
Merged

Fast-forward master branch to where develop branch is #307

merged 7 commits into from
Feb 23, 2024

Commits on Jan 8, 2024

  1. chore: bump uwsgi 

    Refs: HP-2134
    @charn
    charn committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    5c88191 View commit details
    Browse the repository at this point in the history

  2. chore: update uwsgi configuration 

    Allows controlling amount of uwsgi processes using
environment variables.

Also copies some good configuration from other projects.

Refs: HP-2134
    @charn
    charn committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    52202e6 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. chore: add compilemessages for dev env 

    Translations are compiled in the Dockerfile, but
they do not exist on the dev env container when
source is mounted onto the container.

Refs: HP-2219
    @charn
    charn committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    4a9e399 View commit details
    Browse the repository at this point in the history

  2. chore(dockerfile): also bump setuptools and wheel 

    Refs: HP-2219
    @charn
    charn committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    3fc9ee9 View commit details
    Browse the repository at this point in the history

  3. chore: add ALLOW_DUPLICATE_EMAILS to docker env template 

    Refs: HP-2219
    @charn
    charn committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    acc3164 View commit details
    Browse the repository at this point in the history

  4. chore: contrain dev and prop requirements 

    Also bump pip-tools.

Refs: HP-2219
    @charn
    charn committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    3ece954 View commit details
    Browse the repository at this point in the history

  5. feat: users can use helsinki_tunnus heltunnistussuomifi simultaneously 

    It was not possible for a linked keycloak account (i.e. an account
which can use weak or strong authentication) to log into Helsinki
profile.

Refs: HP-2219
    @charn
    charn committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    5d72c61 View commit details
    Browse the repository at this point in the history