diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-21 10:56:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-21 10:56:54 +0000 |
| commit | 14e35ac9b19d358d84e0cfd167f74036937285b6 (patch) | |
| tree | eef0697c489e057cb7660b9e207c2f7fc15826dd | |
| parent | 60f51cd20af5db8759c31c32a9c45db5b5be2199 (diff) | |
| parent | 6da19415531e4c40f48df2c604efe51578cea295 (diff) | |
| download | gitlab-ce-14e35ac9b19d358d84e0cfd167f74036937285b6.tar.gz | |
Merge branch 'blackst0ne-rails5-set-request-format-in--commits-controller' into 'master'
[Rails5] Set request.format in commits_controller
Closes #48144 et #48143
See merge request gitlab-org/gitlab-ce!20023
| -rw-r--r-- | app/controllers/projects/commits_controller.rb | 14 | ||||
| -rw-r--r-- | changelogs/unreleased/blackst0ne-rails5-set-request-format-in--commits-controller.yml | 5 |
2 files changed, 19 insertions, 0 deletions
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb index 7b7cb52d7ed..9e495061f4e 100644 --- a/app/controllers/projects/commits_controller.rb +++ b/app/controllers/projects/commits_controller.rb @@ -9,6 +9,7 @@ class Projects::CommitsController < Projects::ApplicationController before_action :assign_ref_vars before_action :authorize_download_code! before_action :set_commits + before_action :set_request_format, only: :show def show @merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened @@ -61,6 +62,19 @@ class Projects::CommitsController < Projects::ApplicationController @commits = prepare_commits_for_rendering(@commits) end + # Rails 5 sets request.format from the extension. + # Explicitly set to :html. + def set_request_format + request.format = :html if set_request_format? + end + + # Rails 5 sets request.format from extension. + # In this case if the ref ends with `.atom`, it's expected to be the html response, + # not the atom one. So explicitly set request.format as :html to act like rails4. + def set_request_format? + request.format.to_s == "text/html" || @commits.ref.ends_with?("atom") + end + def whitelist_query_limiting Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42330') end diff --git a/changelogs/unreleased/blackst0ne-rails5-set-request-format-in--commits-controller.yml b/changelogs/unreleased/blackst0ne-rails5-set-request-format-in--commits-controller.yml new file mode 100644 index 00000000000..3f8f8fd5d66 --- /dev/null +++ b/changelogs/unreleased/blackst0ne-rails5-set-request-format-in--commits-controller.yml @@ -0,0 +1,5 @@ +--- +title: "[Rails5] Set request.format in commits_controller" +merge_request: 20023 +author: "@blackst0ne" +type: fixed |