summaryrefslogtreecommitdiff
path: root/app/views/users
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-06-05 15:27:35 +0000
committerRobert Speicher <robert@gitlab.com>2018-06-05 15:27:35 +0000
commitffe87460f0925f6e091352552ba52aecea5bf4a8 (patch)
tree85a146300722e66a25a9560804115bf81089da81 /app/views/users
parent1fd2c6460d0d8ff3167fb742b41a4b010cc7ad8b (diff)
parent285ffb223896f2226531be2ba10933414194155c (diff)
downloadgitlab-ce-ffe87460f0925f6e091352552ba52aecea5bf4a8.tar.gz
Merge branch '46585-gdpr-terms-acceptance' into 'master'
Resolve "Missing Accept button for terms of service" Closes #46585 See merge request gitlab-org/gitlab-ce!19156
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/terms/index.html.haml4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/users/terms/index.html.haml b/app/views/users/terms/index.html.haml
index b9f25a71170..33cddf63952 100644
--- a/app/views/users/terms/index.html.haml
+++ b/app/views/users/terms/index.html.haml
@@ -7,6 +7,10 @@
.float-right
= button_to accept_term_path(@term, redirect_params), class: 'btn btn-success prepend-left-8' do
= _('Accept terms')
+ - else
+ .pull-right
+ = link_to root_path, class: 'btn btn-success prepend-left-8' do
+ = _('Continue')
- if can?(current_user, :decline_terms, @term)
.float-right
= button_to decline_term_path(@term, redirect_params), class: 'btn btn-default prepend-left-8' do