summaryrefslogtreecommitdiff
path: root/spec/javascripts
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2019-01-15 22:05:36 +0100
committerHeinrich Lee Yu <heinrich@gitlab.com>2019-04-23 08:31:23 +0800
commit624a1cdab4da67c7b363602aa1178d0e6ff63475 (patch)
tree09892175f885c4c5f6725314b25a61280395efcb /spec/javascripts
parent46bdbc5d776a0438366426e0ef48911123311744 (diff)
downloadgitlab-ce-624a1cdab4da67c7b363602aa1178d0e6ff63475.tar.gz
Upgrade Rails to 5.1.6.1
Model.new.attributes now also returns encrypted attributes.
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/merge_request_spec.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js
index 431798c6ec3..cadcc15385f 100644
--- a/spec/javascripts/merge_request_spec.js
+++ b/spec/javascripts/merge_request_spec.js
@@ -58,7 +58,7 @@ describe('MergeRequest', function() {
{
merge_request: {
description: '- [ ] Task List Item',
- lock_version: undefined,
+ lock_version: 0,
update_task: { line_number: lineNumber, line_source: lineSource, index, checked },
},
},