4 commits

Author	SHA1	Message	Date
Douwe Maan	89bd78352e	Merge branch 'ssrf-protections-round-2' into 'security-10-1' ... Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions See merge request gitlab/gitlabhq!2219 (cherry picked from commit 4a1e73783d5480aa514db7b53e10c075f95580b5) 1bffa0c3 Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions	2017-11-08 20:11:08 -08:00
James Edwards-Jones	b296921681	Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4' ... Ensure user and hostnames begin with an alnum character in UrlBlocker See merge request !2138	2017-08-10 20:47:28 +01:00
Rubén Dávila	83a0c39808	Merge branch 'ssrf' into 'security' ... nil check for url_blocker? See merge request !2076	2017-03-20 18:53:45 -07:00
Douwe Maan	65aafb9917	Merge branch 'ssrf' into 'security' ... Protect server against SSRF in project import URLs See merge request !2068	2017-03-20 18:53:04 -07:00