diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-05 18:27:35 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-05 18:27:35 +0300 |
| commit | ffe87460f0925f6e091352552ba52aecea5bf4a8 (patch) | |
| tree | 85a146300722e66a25a9560804115bf81089da81 /app/controllers | |
| parent | 1fd2c6460d0d8ff3167fb742b41a4b010cc7ad8b (diff) | |
| parent | 285ffb223896f2226531be2ba10933414194155c (diff) | |
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/controllers')
| -rw-r--r-- | app/controllers/users/terms_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/users/terms_controller.rb b/app/controllers/users/terms_controller.rb index ab685b9106e..f7c6d1d59db 100644 --- a/app/controllers/users/terms_controller.rb +++ b/app/controllers/users/terms_controller.rb @@ -13,6 +13,10 @@ module Users def index @redirect = redirect_path + + if @term.accepted_by_user?(current_user) + flash.now[:notice] = "You have already accepted the Terms of Service as #{current_user.to_reference}" + end end def accept |