realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

repalce with official backported patch

Browse source
This commit is contained in:
Praveen Arimbrathodiyil 2017-03-21 22:08:56 +05:30
parent 3fb54e9d80
commit 849cb09aef
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
debian/patches/cve-2017-0882.patch vendored
View file

@ -1,28 +1,26 @@
Description: Security patch for CVE-2017-0882 diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
Author: Brian Neel index cb64926..d7928cb 100644
Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/29661
Last-Update: 2017-03-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/app/controllers/projects/issues_controller.rb --- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@ class Projects::IssuesController < Projects::ApplicationController
end end
format.json do format.json do
- render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }) - render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
+ render json: @issue.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) + render json: @issue.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } })
end end
end end
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 6e15c06..317011c 100644
--- a/app/controllers/projects/merge_requests_controller.rb --- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb
@@ -278,7 +278,7 @@ @@ -278,7 +278,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request.target_project, @merge_request]) @merge_request.target_project, @merge_request])
end end
format.json do format.json do
- render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }) - render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } })
+ render json: @merge_request.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short]) + render json: @merge_request.to_json(include: { milestone: {}, assignee: { only: [:name, :username], methods: [:avatar_url] }, labels: { methods: :text_color } })
end end
end end
else else