delta/gitlab/gitlab-ce.git/config/initializers, branch document-lambda-deploy gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2019-08-29T22:17:37+00:00 Robert Speicher rspeicher@gmail.com 2019-08-29T22:17:37+00:00 7698d405506bc10dfd7fb2e6e02b419dd5925725 






Merge branch 'security-enable-image-proxy' into 'master'
2019-08-29T21:34:29+00:00

GitLab Release Tools Bot
robert+release-tools@gitlab.com

2019-08-29T21:34:29+00:00

090956259c47d839b136f9391c3f74255764da81

Use image proxy to mitigate stealing ip addresses

Closes #2812

See merge request gitlab/gitlabhq!2926




Use image proxy to mitigate stealing ip addresses

Closes #2812

See merge request gitlab/gitlabhq!2926






Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'
2019-08-29T21:34:12+00:00

GitLab Release Tools Bot
robert+release-tools@gitlab.com

2019-08-29T21:34:12+00:00

a5b2a3786056ddf99de06c8315e9a42c3bf86cd5

Require a captcha after unique failed logins from the same IP

See merge request gitlab/gitlabhq!3270




Require a captcha after unique failed logins from the same IP

See merge request gitlab/gitlabhq!3270






Merge branch 'security-ssrf-kubernetes-dns-12-3' into 'master'
2019-08-29T21:33:42+00:00

GitLab Release Tools Bot
robert+release-tools@gitlab.com

2019-08-29T21:33:42+00:00

15b88fe57faff899b76d24e41985d83612c7de3a

DNS Rebind SSRF in Kubernetes Integration

See merge request gitlab/gitlabhq!3345




DNS Rebind SSRF in Kubernetes Integration

See merge request gitlab/gitlabhq!3345






Set default authorized_keys_file
2019-08-29T08:33:04+00:00

Patrick Bajao
ebajao@gitlab.com

2019-08-23T05:57:22+00:00

95ffd22f07d821f223388bd60a287365d3b7d8f6

This is the same as gitlab-shell's default. This is to ensure
that it's always set.

It needs to be the same as gitlab-shell's default because we
don't set a default value in omnibus-gitlab. If users don't
set the value of that config in their install and they upgraded,
we must ensure that it's still going to point to the same
authorized keys file.





This is the same as gitlab-shell's default. This is to ensure
that it's always set.

It needs to be the same as gitlab-shell's default because we
don't set a default value in omnibus-gitlab. If users don't
set the value of that config in their install and they upgraded,
we must ensure that it's still going to point to the same
authorized keys file.







Merge branch 'performance-bar-warnings' into 'master'
2019-08-29T03:54:15+00:00

Stan Hu
stanhu@gmail.com

2019-08-29T03:54:15+00:00

b31b6764ac02759ac3b5ab2781023a879bdf2c8f

Add warnings to performance bar response

See merge request gitlab-org/gitlab-ce!31054




Add warnings to performance bar response

See merge request gitlab-org/gitlab-ce!31054






Add top-level warnings key to performance bar response
2019-08-28T15:39:33+00:00

Sean McGivern
sean@gitlab.com

2019-08-23T12:05:38+00:00

9bfb012a56918e3412ce767c19f5f9ca2329a78c

This key is useful to reduce the amount of logic needed on the frontend:
if `has_warnings` is true, then the frontend knows that the request in
question has warnings for some metric.





This key is useful to reduce the amount of logic needed on the frontend:
if `has_warnings` is true, then the frontend knows that the request in
question has warnings for some metric.







Replace prepend_entity with prepend_if_ee
2019-08-27T15:11:15+00:00

Winnie Hellmann
winnie@gitlab.com

2019-08-27T15:11:15+00:00

75353242e2a2925fa968a3f9a5ad1db051a194cd

(cherry picked from commit 897a9d308db46b620b738b98f2b0e5630ac7d2dd)





(cherry picked from commit 897a9d308db46b620b738b98f2b0e5630ac7d2dd)







Update docs and comments about saml with allow_bypass_two_factor
2019-08-27T03:46:32+00:00

dodocat
jingqq5210@gmail.com

2019-08-27T03:46:32+00:00

6e2032f24e0428189f8c9fe9e296a9630277155e

allow_bypass_two_factor configration dose not work with saml provider





allow_bypass_two_factor configration dose not work with saml provider







Add support for using a Camo proxy server
2019-08-24T04:44:53+00:00

Brett Walker
bwalker@gitlab.com

2019-02-20T23:51:55+00:00

ad05e488636ebe05b4985dbf3c7d912fd8d56f49

User images and videos will get proxied through
the Camo server in order to keep malicious
sites from collecting the IP address of users.





User images and videos will get proxied through
the Camo server in order to keep malicious
sites from collecting the IP address of users.