diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-05-11 12:40:44 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-05-11 12:40:44 -0700 |
| commit | e3bac7dffe87a6e5adb1b51700acedba09420515 (patch) | |
| tree | 3cad0696bdfeb79609c0442f79708fbbed2d93f1 /app/models/diff_discussion.rb | |
| parent | f4b6bc06da18bce9553032463ca2012d7cad7268 (diff) | |
| parent | e7e132529bff3af38175076b84c818b6dea4b05f (diff) | |
| download | gitlab-ce-sh-ajax-tests.tar.gz | |
Merge branch 'master' into sh-ajax-testssh-ajax-tests
Diffstat (limited to 'app/models/diff_discussion.rb')
| -rw-r--r-- | app/models/diff_discussion.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb index d627fbe327f..14ddd2fcc88 100644 --- a/app/models/diff_discussion.rb +++ b/app/models/diff_discussion.rb @@ -39,7 +39,7 @@ class DiffDiscussion < Discussion def reply_attributes super.merge( original_position: original_position.to_json, - position: position.to_json, + position: position.to_json ) end end |