From 328c999cb9476b836fab70020a1e4393e37c8b76 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 5 Dec 2019 14:31:44 +0100 Subject: [PATCH] ci(minor): reenable prospector --- .gitlab-ci.yml | 26 +++++++------------------- passbook/admin/views/users.py | 4 ++-- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6999b6284..5d0153a2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,13 +64,13 @@ migrations: services: - postgres:latest - redis:latest -# prospector: -# script: -# - prospector -# stage: test -# services: -# - postgres:latest -# - redis:latest +prospector: + script: + - prospector + stage: test + services: + - postgres:latest + - redis:latest pylint: script: - pylint passbook @@ -114,18 +114,6 @@ build-passbook-static: services: - postgres:latest - redis:latest -# build-passbook-gatekeeper: -# stage: build -# image: -# name: gcr.io/kaniko-project/executor:debug -# entrypoint: [""] -# before_script: -# - echo "{\"auths\":{\"docker.beryju.org\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json -# script: -# - /kaniko/executor --context $CI_PROJECT_DIR/gatekeeper --dockerfile $CI_PROJECT_DIR/gatekeeper/Dockerfile --destination docker.beryju.org/passbook/gatekeeper:latest --destination docker.beryju.org/passbook/gatekeeper:0.7.4-beta -# only: -# - tags -# - /^version/.*$/ package-helm: image: debian:stretch-slim diff --git a/passbook/admin/views/users.py b/passbook/admin/views/users.py index 1a778fe67..535d4d264 100644 --- a/passbook/admin/views/users.py +++ b/passbook/admin/views/users.py @@ -46,8 +46,8 @@ class UserUpdateView(SuccessMessageMixin, LoginRequiredMixin, form_class = UserForm permission_required = 'passbook_core.change_user' - context_object_name = 'object' # By default the object's name - # is user which is used by other checks + # By default the object's name is user which is used by other checks + context_object_name = 'object' template_name = 'generic/update.html' success_url = reverse_lazy('passbook_admin:users') success_message = _('Successfully updated User')