diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-21 00:51:53 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-21 00:51:53 +0000 |
| commit | ca45e925dfcf5b67fd494bd2009ca7ed0447dacc (patch) | |
| tree | 7f318cc34a29132bfbb77f90862885fd97588add /lib | |
| parent | 26544eabe7ff607f3c723e7b8b8725b8f5b732cb (diff) | |
| parent | 3377808193e8571b028fd05f009a7d1089dcc916 (diff) | |
| download | gitlab-ce-ca45e925dfcf5b67fd494bd2009ca7ed0447dacc.tar.gz | |
Merge branch 'reply-by-email-diff' into 'master'
Fix reply by email for comments on a specific line in a diff/commit.
Fixes #2363.
See merge request !1364
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/email/receiver.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb index 355fbd27898..341b557858f 100644 --- a/lib/gitlab/email/receiver.rb +++ b/lib/gitlab/email/receiver.rb @@ -98,7 +98,8 @@ module Gitlab note: reply, noteable_type: sent_notification.noteable_type, noteable_id: sent_notification.noteable_id, - commit_id: sent_notification.commit_id + commit_id: sent_notification.commit_id, + line_code: sent_notification.line_code ).execute end end |