diff options
| author | Imre Farkas <ifarkas@gitlab.com> | 2018-06-12 11:35:34 +0200 |
|---|---|---|
| committer | Imre Farkas <ifarkas@gitlab.com> | 2018-06-15 16:03:38 +0200 |
| commit | a0ac000ad397fb4111d3184d084a9d293eb184c7 (patch) | |
| tree | b8ab4b315437cf1aee270ccf83d031cba01cea11 /app/controllers/concerns/issues_action.rb | |
| parent | 1ed954e8a7abd3a8bc1649d0deec6d1ee2149496 (diff) | |
| download | gitlab-ce-47672-set_inline_content_type_for_ics.tar.gz | |
Render calendar feed inline when accessed from GitLab47672-set_inline_content_type_for_ics
With text/calendar as Content-Type, the browser always downloads the
content as a file (even ignoring the Content-Disposition header). We
want to display the content inline when accessed from Gitlab, similarly
to the RSS feed.
Diffstat (limited to 'app/controllers/concerns/issues_action.rb')
| -rw-r--r-- | app/controllers/concerns/issues_action.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb index b6eb7d292fc..9d58656773d 100644 --- a/app/controllers/concerns/issues_action.rb +++ b/app/controllers/concerns/issues_action.rb @@ -1,6 +1,7 @@ module IssuesAction extend ActiveSupport::Concern include IssuableCollections + include IssuesCalendar # rubocop:disable Gitlab/ModuleWithInstanceVariables def issues @@ -17,18 +18,9 @@ module IssuesAction end # rubocop:enable Gitlab/ModuleWithInstanceVariables - # rubocop:disable Gitlab/ModuleWithInstanceVariables def issues_calendar - @issues = issuables_collection - .non_archived - .with_due_date - .limit(100) - - respond_to do |format| - format.ics { response.headers['Content-Disposition'] = 'inline' } - end + render_issues_calendar(issuables_collection) end - # rubocop:enable Gitlab/ModuleWithInstanceVariables private |