summaryrefslogtreecommitdiff
path: root/app/views/authentication
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-17 15:09:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-17 15:09:24 +0000
commite14148b7edcfc4aff7ec966c399b3913318fb293 (patch)
tree31866782e6411c7ddc6b8b9f42ed66e700f6359b /app/views/authentication
parentc6283014fe69dc6699b00abedff607bd5c5718b0 (diff)
downloadgitlab-ce-e14148b7edcfc4aff7ec966c399b3913318fb293.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/authentication')
-rw-r--r--app/views/authentication/_register.html.haml1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/authentication/_register.html.haml b/app/views/authentication/_register.html.haml
index 55ab6220744..f1aa76d115a 100644
--- a/app/views/authentication/_register.html.haml
+++ b/app/views/authentication/_register.html.haml
@@ -1,6 +1,5 @@
#js-register-token-2fa
--# haml-lint:disable InlineJavaScript
%script#js-register-2fa-message{ type: "text/template" }
%p <%= message %>