diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-20 11:55:58 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-20 11:55:58 +0300 |
| commit | 648557048226ba98c514531135e96df9c34bdda7 (patch) | |
| tree | 2bc8adf9fcd4a27abef384f8da3aa95652d51e2a /app | |
| parent | fe314d460efd18ea064df987a5a215904b95fd4e (diff) | |
| download | gitlab-ce-648557048226ba98c514531135e96df9c34bdda7.tar.gz | |
Increase atom feed test coverage. Prevent 500 error if description is missing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/events/_event_issue.atom.haml | 3 | ||||
| -rw-r--r-- | app/views/events/_event_merge_request.atom.haml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/events/_event_issue.atom.haml b/app/views/events/_event_issue.atom.haml index 030c961c355..eba2b63797a 100644 --- a/app/views/events/_event_issue.atom.haml +++ b/app/views/events/_event_issue.atom.haml @@ -1,2 +1,3 @@ %div{xmlns: "http://www.w3.org/1999/xhtml"} - = markdown issue.description + - if issue.description.present? + = markdown issue.description diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml index ab3a485e908..0aea2d17d65 100644 --- a/app/views/events/_event_merge_request.atom.haml +++ b/app/views/events/_event_merge_request.atom.haml @@ -1,2 +1,3 @@ %div{xmlns: "http://www.w3.org/1999/xhtml"} - = markdown merge_request.description + - if merge_request.description.present? + = markdown merge_request.description |