diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 18:08:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 18:08:54 +0000 |
commit | 0d6fa033121a9bef708b8f2de186c4034c61d4a3 (patch) | |
tree | 851d65a09efbffa114c9a273e590d55cfb1436ab /app/controllers/user_callouts_controller.rb | |
parent | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (diff) | |
download | gitlab-ce-0d6fa033121a9bef708b8f2de186c4034c61d4a3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/user_callouts_controller.rb')
-rw-r--r-- | app/controllers/user_callouts_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/user_callouts_controller.rb b/app/controllers/user_callouts_controller.rb index ebf1dd8ca02..4ee75218db1 100644 --- a/app/controllers/user_callouts_controller.rb +++ b/app/controllers/user_callouts_controller.rb @@ -2,7 +2,10 @@ class UserCalloutsController < ApplicationController def create - if ensure_callout.persisted? + callout = ensure_callout + + if callout.persisted? + callout.update(dismissed_at: Time.now) respond_to do |format| format.json { head :ok } end |