diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-06-18 12:35:20 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-06-18 12:35:20 +0300 |
commit | a170c587a0ee2f303908c70a942ef3f163e2ddb7 (patch) | |
tree | 7f5e43a22c2e555284202e93a10a6d8ded65d7fe /app/controllers/projects | |
parent | 47bfd782bdad9a021ae3241825c9538d42eee7a4 (diff) | |
parent | 6954ebbe55688633c6e4b43c28088e195191e8fc (diff) |
Merge branch '47672-set_inline_content_type_for_ics' into 'master'
Render calendar feed inline when accessed from GitLab
Closes #47672
See merge request gitlab-org/gitlab-ce!19698
Diffstat (limited to 'app/controllers/projects')
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 35c36c725e2..7c897b2d86c 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -4,6 +4,7 @@ class Projects::IssuesController < Projects::ApplicationController include IssuableActions include ToggleAwardEmoji include IssuableCollections + include IssuesCalendar include SpammableActions prepend_before_action :authenticate_user!, only: [:new] @@ -40,14 +41,7 @@ class Projects::IssuesController < Projects::ApplicationController end def calendar - @issues = @issuables - .non_archived - .with_due_date - .limit(100) - - respond_to do |format| - format.ics { response.headers['Content-Disposition'] = 'inline' } - end + render_issues_calendar(@issuables) end def new |