summaryrefslogtreecommitdiff
path: root/app/services/issues/update_service.rb
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2019-01-23 11:28:09 -0600
committerFatih Acet <acetfatih@gmail.com>2019-01-30 23:18:16 +0100
commit4b25f1e6405fb288fd06ee610aec154efedcdb8c (patch)
treec710614e03fa5f998b1105acf1eff1714b4ed42a /app/services/issues/update_service.rb
parentd9c5668d2915d64cbd91880e1ff1c0c743e8aa99 (diff)
downloadgitlab-ce-4b25f1e6405fb288fd06ee610aec154efedcdb8c.tar.gz
Ignore lock_version for task updates
Diffstat (limited to 'app/services/issues/update_service.rb')
-rw-r--r--app/services/issues/update_service.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index 8b59c501142..cf6173da8d4 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -141,6 +141,11 @@ module Issues
params[:description] = updated_content[:content]
params[:description_html] = updated_content[:content_html]
+ # since we're updating a very specific line, we don't care whether
+ # the `lock_version` sent from the FE is the same or not. Just
+ # make sure the data hasn't changed since we queried it
+ params[:lock_version] = issue.lock_version
+
update_task(issue)
end
end