diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..0b3779e53 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9940ee992..90a2d3e7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: GIT_CLEAN_FLAGS: "-ffdx" # Change pip's cache directory to be inside the project directory since we can only cache local items. PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" - EXTRA_VALUES_ACCEPTANCE: '--values ./secrets/config/common/common.yaml --values ./secrets/config/common/cryptnono.yaml --values ./secrets/config/common/gesis.yaml --values ./secrets/config/gesis-acceptance.yaml --values ./config/gesis.yml --values ./config/gesis-acceptance.yml' + EXTRA_VALUES_ACCEPTANCE: "--values ./secrets/config/common/common.yaml --values ./secrets/config/common/cryptnono.yaml --values ./secrets/config/common/gesis.yaml --values ./secrets/config/gesis-acceptance.yaml --values ./config/gesis.yml --values ./config/gesis-acceptance.yml" # This workflow:rules are required to enable merge request pipelines! workflow: @@ -53,7 +53,7 @@ include: stage: lint dir: mybinder extra_values: ${EXTRA_VALUES_ACCEPTANCE} - git_crypt: 'true' + git_crypt: "true" rules: - if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH @@ -65,6 +65,6 @@ include: dir: mybinder k8s_context: methods-hub/binder.methodshub.gesis.org:acceptance extra_values: ${EXTRA_VALUES_ACCEPTANCE} - git_crypt: 'true' + git_crypt: "true" rules: - if: $CI_SERVER_FQDN == "git.gesis.org" && $CI_PIPELINE_SOURCE == 'merge_request_event' diff --git a/config/gesis.yml b/config/gesis.yml index de07db144..dc5ab64f0 100644 --- a/config/gesis.yml +++ b/config/gesis.yml @@ -116,4 +116,4 @@ prometheus: persistentVolume: storageClass: local-storage-prometheus static: - enabled: false \ No newline at end of file + enabled: false diff --git a/mybinder/files/etc/jupyter/templates/login.html b/mybinder/files/etc/jupyter/templates/login.html index 7f99973f9..d2a15df7a 100644 --- a/mybinder/files/etc/jupyter/templates/login.html +++ b/mybinder/files/etc/jupyter/templates/login.html @@ -1,32 +1,27 @@ -{% extends "templates/login.html" %} - -{% block header_buttons %} -{% block login_widget %} -{% endblock %} +{% extends "templates/login.html" %} {% block header_buttons %} {% block +login_widget %} {% endblock %} -{{super()}} -{% endblock header_buttons %} - -{% block site %} +{{super()}} {% endblock header_buttons %} {% block site %}

Binder inaccessible

- You can get a new Binder for this repo by clicking here. + You can get a new Binder for this repo by clicking + here.

-

- The shareable URL for this repo is: {{binder_url}} -

+

The shareable URL for this repo is: {{binder_url}}

Is this a Binder that you created?

- If so, your authentication cookie for this Binder has been deleted or expired. - You can launch a new Binder for this repo by clicking here. + If so, your authentication cookie for this Binder has been deleted or + expired. You can launch a new Binder for this repo by clicking + here.

Did someone give you this Binder link?

- If so, the link is outdated or incorrect. - Recheck the link for typos or ask the person who gave you the link for an updated link. - A shareable Binder link should look like {{binder_url}}. + If so, the link is outdated or incorrect. Recheck the link for typos or ask + the person who gave you the link for an updated link. A shareable Binder + link should look like {{binder_url}}. +

{% endblock site %} diff --git a/mybinder/files/etc/jupyter/templates/page.html b/mybinder/files/etc/jupyter/templates/page.html index c46e72444..93194ed50 100644 --- a/mybinder/files/etc/jupyter/templates/page.html +++ b/mybinder/files/etc/jupyter/templates/page.html @@ -1,46 +1,48 @@ -{% extends "templates/page.html" %} - -{% block header_buttons %} - -{% block login_widget %} -{% endblock %} - -{% if jitsi_url %} - - Join this repo's Video Chat - -{% endif %} - -{% if ref_url %} - - Visit repo - -{% endif %} - -{% if persistent_binder_url %} - - - -{% endif %} - -{% endblock header_buttons %} - -{% block script %} -{% if persistent_binder_url %} - -{% endif %} -{% endblock %} +{% endif %} {% endblock %} diff --git a/mybinder/files/etc/jupyter/templates/tree.html b/mybinder/files/etc/jupyter/templates/tree.html index b5f81b033..a266fd386 100644 --- a/mybinder/files/etc/jupyter/templates/tree.html +++ b/mybinder/files/etc/jupyter/templates/tree.html @@ -1,17 +1,13 @@ -{% extends "templates/tree.html" %} - -{% block headercontainer %} - -{% endblock %} - -{% block header_buttons %} - {{super()}} - {% if shutdown_button %} - - - - {% endif %} -{% endblock header_buttons %} +{% extends "templates/tree.html" %} {% block headercontainer %} + +{% endblock %} {% block header_buttons %} {{super()}} {% if shutdown_button %} + + + +{% endif %} {% endblock header_buttons %} diff --git a/mybinder/templates/static/configmap.yaml b/mybinder/templates/static/configmap.yaml index 067db4d81..0b309a626 100644 --- a/mybinder/templates/static/configmap.yaml +++ b/mybinder/templates/static/configmap.yaml @@ -24,4 +24,4 @@ metadata: release: {{ .Release.Name }} data: {{- (.Files.Glob "files/static/*").AsConfig | nindent 2 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/mybinder/templates/static/deployment.yaml b/mybinder/templates/static/deployment.yaml index 119c24984..aeef50bd8 100644 --- a/mybinder/templates/static/deployment.yaml +++ b/mybinder/templates/static/deployment.yaml @@ -42,4 +42,4 @@ spec: name: config - mountPath: /www/data/ name: files -{{- end }} \ No newline at end of file +{{- end }} diff --git a/mybinder/templates/static/ingress.yaml b/mybinder/templates/static/ingress.yaml index a952e07d2..f5c6c50d1 100644 --- a/mybinder/templates/static/ingress.yaml +++ b/mybinder/templates/static/ingress.yaml @@ -37,4 +37,4 @@ spec: {{- range $host := .Values.static.ingress.hosts }} - {{ $host }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/mybinder/templates/static/service.yaml b/mybinder/templates/static/service.yaml index 1fdb79f21..4c763d84c 100644 --- a/mybinder/templates/static/service.yaml +++ b/mybinder/templates/static/service.yaml @@ -16,4 +16,4 @@ spec: app: static component: nginx release: {{ .Release.Name }} -{{- end }} \ No newline at end of file +{{- end }}