diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-13 08:49:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-13 08:49:13 +0000 |
| commit | 896aa2a1f0a79a18ad1cd7530fa0c6acaa41288d (patch) | |
| tree | 3c7469d592892f9297af0f5207dc24115c7f7ef2 /app/controllers/concerns | |
| parent | 578f460674e14b4c8ca71cda7ac5a0378b724712 (diff) | |
| parent | 3c1700cde65ef8a410c2c2a9f44727613d3ef9ff (diff) | |
| download | gitlab-ce-896aa2a1f0a79a18ad1cd7530fa0c6acaa41288d.tar.gz | |
Merge branch 'fix/33584-atom-layout' into 'master'
Refactor atom builder by using a layout
See merge request !12114
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/issues_action.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb index b17c138d5c7..404559c8707 100644 --- a/app/controllers/concerns/issues_action.rb +++ b/app/controllers/concerns/issues_action.rb @@ -14,7 +14,7 @@ module IssuesAction respond_to do |format| format.html - format.atom { render layout: false } + format.atom { render layout: 'xml.atom' } end end end |