Commit 8ed2e388 authored by Silvio Rhatto's avatar Silvio Rhatto
Browse files

Merge branch 'newtranslationbranch' into 'main' 

As part of tpo/community/l10n#40112 i updated the branch name

See merge request tpo/onion-services/onion-launchpad!67
parents 63c11383 9ee56c5f

.github/workflows/gh-pages.yml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ permissions: 
  contents: write



env:

  TRANSLATION_BRANCH: onion-support-landing-page

  TRANSLATION_BRANCH: onion-launchpad

  ONION_LAUNCHPAD_SET_SAFE_DIRECTORY: 1

  LEKTOR_FOREGROUND_COLOR: ${{ secrets.LEKTOR_FOREGROUND_COLOR }}

  LEKTOR_BACKGROUND_COLOR: ${{ secrets.LEKTOR_BACKGROUND_COLOR }}

.gitlab-ci-deployment.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
image: python:3.8-bullseye



variables:

  TRANSLATION_BRANCH: onion-support-landing-page

  TRANSLATION_BRANCH: onion-launchpad

  LEKTOR_FOREGROUND_COLOR: 'CF5C00'

  LEKTOR_BACKGROUND_COLOR: 'EA6903'

  LEKTOR_BUTTON_COLOR: 'EA6903'

.gitlab-ci-test.yml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
image: python:3.8-bullseye



variables:

  TRANSLATION_BRANCH: onion-support-landing-page

  TRANSLATION_BRANCH: onion-launchpad

  LEKTOR_FOREGROUND_COLOR: 'CF5C00'

  LEKTOR_BACKGROUND_COLOR: 'EA6903'

  LEKTOR_BUTTON_COLOR: 'EA6903'

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
---

variables:

  TRANSLATION_BRANCH: onion-support-landing-page

  TRANSLATION_BRANCH: onion-launchpad

  LEKTOR_FOREGROUND_COLOR: 'CF5C00'

  LEKTOR_BACKGROUND_COLOR: 'EA6903'

  LEKTOR_BUTTON_COLOR: 'EA6903'

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ ENTRYPOINT ["scripts/server"] 
# This reduces the image size, but without this folder the container startup

# will take longer when running in development mode ("lektor server") as the

# ENTRYPOINT.

#RUN rm -rf /home/${APP}/.virtualenvs/onion-support-landing-page

#RUN rm -rf /home/${APP}/.virtualenvs/onion-launchpad



FROM landing AS apache