summaryrefslogtreecommitdiff
path: root/lib/api/topics.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-20 13:37:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-20 13:37:47 +0000
commitaee0a117a889461ce8ced6fcf73207fe017f1d99 (patch)
tree891d9ef189227a8445d83f35c1b0fc99573f4380 /lib/api/topics.rb
parent8d46af3258650d305f53b819eabf7ab18d22f59e (diff)
downloadgitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'lib/api/topics.rb')
-rw-r--r--lib/api/topics.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/topics.rb b/lib/api/topics.rb
index bd28ebe58a9..b9c2bcc2da8 100644
--- a/lib/api/topics.rb
+++ b/lib/api/topics.rb
@@ -69,6 +69,8 @@ module API
topic = ::Projects::Topic.find(params[:id])
+ topic.remove_avatar! if params.key?(:avatar) && params[:avatar].nil?
+
if topic.update(declared_params(include_missing: false))
present topic, with: Entities::Projects::Topic
else