diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-29 16:30:55 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-29 16:30:55 +0000 |
| commit | b1f924c165525f24848df3a7a4119b74fefc6e21 (patch) | |
| tree | d7b8cd21dae0ce335ae4e3a34cfa4ea50c226530 /app | |
| parent | c19195f4858cee08918953e838ed2ae423ac574b (diff) | |
| parent | 2fa20f2d4f9dd6b5fd4c55018da243d9a8d0548f (diff) | |
| download | gitlab-ce-b1f924c165525f24848df3a7a4119b74fefc6e21.tar.gz | |
Merge branch 'handle-nil-description-slack-message' into 'master'
Handle nil descriptions in Slack issue messages
Closes #14676
See merge request !3420
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_services/slack_service/issue_message.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/slack_service/issue_message.rb b/app/models/project_services/slack_service/issue_message.rb index 5af24a80609..438ff33fdff 100644 --- a/app/models/project_services/slack_service/issue_message.rb +++ b/app/models/project_services/slack_service/issue_message.rb @@ -22,7 +22,7 @@ class SlackService @issue_url = obj_attr[:url] @action = obj_attr[:action] @state = obj_attr[:state] - @description = obj_attr[:description] + @description = obj_attr[:description] || '' end def attachments |