spec/controllers/projects/merge_requests_controller_spec.rb · a70346fc6530aa28a98e4aa4cf0f40e2c3bcef6b · Forest Godfrey / gitlab-ce

Mar 18, 2017

Merge branch 'render-json-leak' into 'security' · a70346fc

DJ Mountney authored Mar 18, 2017

fix for render json include leaks

See merge request !2074
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	spec/controllers/projects/issues_controller_spec.rb

a70346fc

Merge branch 'render-json-leak' into 'security'

DJ Mountney authored Mar 18, 2017

fix for render json include leaks

See merge request !2074
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	spec/controllers/projects/issues_controller_spec.rb