Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • develop
  • main
  • new-changes
  • renovate/django-5.x
  • renovate/sentry-sdk-2.x
  • renovate/whitenoise-6.x
  • v1.0.0
  • v1.0.1
  • v1.1.0
  • v1.1.1
  • v1.1.2
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.0.3
  • v2.1.0
  • v3.0.0
  • v3.0.0-develop.1
  • v3.0.1
  • v3.0.2
  • v3.0.2-develop.1
  • v3.0.3
22 results

Target

Select target project
  • tobiasff3200/django-core
1 result
Select Git revision
  • develop
  • main
  • new-changes
  • renovate/django-5.x
  • renovate/sentry-sdk-2.x
  • renovate/whitenoise-6.x
  • v1.0.0
  • v1.0.1
  • v1.1.0
  • v1.1.1
  • v1.1.2
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.0.3
  • v2.1.0
  • v3.0.0
  • v3.0.0-develop.1
  • v3.0.1
  • v3.0.2
  • v3.0.2-develop.1
  • v3.0.3
22 results
Show changes

Commits on Source 6

...@@ -151,3 +151,4 @@ wedding/ ...@@ -151,3 +151,4 @@ wedding/
wishlist/ wishlist/
trips/ trips/
/static/core/css/output.css /static/core/css/output.css
/media/*
stages: ---
- test
- docker
- release
variables:
LICENSE_FINDER_CLI_OPTS: '--recursive'
docker:
stage: docker
image: docker:24
services:
- docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG -t $CI_REGISTRY_IMAGE:latest .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
- docker push $CI_REGISTRY_IMAGE:latest
only:
- tags
release:
image: node:20-buster-slim
stage: release
before_script:
- apt-get update && apt-get install -y --no-install-recommends git-core ca-certificates
- npm install -g semantic-release @semantic-release/gitlab @semantic-release/git @semantic-release/changelog @semantic-release/release-notes-generator
script:
- semantic-release
only:
- main
include: include:
- template: Dependency-Scanning.gitlab-ci.yml - project: tobiasff3200/ci-cd
- template: Security/License-Scanning.gitlab-ci.yml file: .gitlab-ci.yml
- template: Security/SAST.gitlab-ci.yml
- template: Secret-Detection.gitlab-ci.yml
- template: Code-Quality.gitlab-ci.yml
\ No newline at end of file
version: 25 version: 25
jobs: jobs:
- name: Git Sync Pull - name: Git Sync Push
steps: steps:
- !PullRepository - !PushRepository
name: Pull from gitlab.fachschaften.org name: Push to gitlab.fachschaften.org
remoteUrl: https://gitlab.fachschaften.org/tobiasff3200/django-core.git remoteUrl: https://gitlab.fachschaften.org/tobiasff3200/django-core.git
syncToChildProject: false
userName: Tobias userName: Tobias
passwordSecret: GitLab.Fachschaften.org_Sync_Token passwordSecret: GitLab.Fachschaften.org_Sync_Token
refs: refs/heads/* refs/tags/*
withLfs: true
force: false force: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers: triggers:
- !ScheduleTrigger - !BranchUpdateTrigger {}
cronExpression: 5 4 * * * ? - !TagCreateTrigger {}
retryCondition: never retryCondition: never
maxRetries: 3 maxRetries: 3
retryDelay: 30 retryDelay: 30
timeout: 3600 timeout: 3600
- name: Git Sync Push - name: Git Sync Pull
steps: steps:
- !PushRepository - !PullRepository
name: Push to gitlab.fachschaften.org name: Pull from gitlab.fachschaften.org
remoteUrl: https://gitlab.fachschaften.org/tobiasff3200/django-core.git remoteUrl: https://gitlab.fachschaften.org/tobiasff3200/django-core.git
syncToChildProject: false
userName: Tobias userName: Tobias
passwordSecret: GitLab.Fachschaften.org_Sync_Token passwordSecret: GitLab.Fachschaften.org_Sync_Token
refs: refs/heads/* refs/tags/*
withLfs: true
force: false force: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers: triggers:
- !BranchUpdateTrigger {} - !ScheduleTrigger
- !TagCreateTrigger {} cronExpression: 0 0 7/12 * * ? *
retryCondition: never retryCondition: never
maxRetries: 3 maxRetries: 3
retryDelay: 30 retryDelay: 30
......
Django==4.2.7 Django==5.0
whitenoise==6.6.0 whitenoise==6.6.0
gunicorn==21.2.0 gunicorn==21.2.0
\ No newline at end of file
...@@ -24,9 +24,11 @@ ...@@ -24,9 +24,11 @@
</label> </label>
</div> </div>
<div class="flex-1 px-2 mx-2"> <div class="flex-1 px-2 mx-2">
{% block home_logo %}
<a href="{% url 'home_view' %}" class="text-lg font-bold align-middle"> <a href="{% url 'home_view' %}" class="text-lg font-bold align-middle">
{% block home_logo %}DaisyUI{% endblock %} DaisyUI
</a> </a>
{% endblock %}
</div> </div>
<div class="flex-none hidden lg:block z-10"> <div class="flex-none hidden lg:block z-10">
<ul class="menu menu-horizontal"> <ul class="menu menu-horizontal">
......