Commit Graph

98 Commits

Author SHA1 Message Date
GitLab Bot 154523302b Add latest changes from gitlab-org/gitlab@master 2021-04-27 12:10:12 +00:00
GitLab Bot 7e1e45d40a Add latest changes from gitlab-org/gitlab@master 2021-04-23 15:09:37 +00:00
GitLab Bot 3df6bfc24c Add latest changes from gitlab-org/gitlab@master 2021-04-12 15:09:30 +00:00
GitLab Bot 4046c3447e Add latest changes from gitlab-org/gitlab@master 2021-02-05 15:09:28 +00:00
GitLab Bot 442a79b733 Add latest changes from gitlab-org/gitlab@master 2021-01-19 12:10:46 +00:00
GitLab Bot 707742e59c Add latest changes from gitlab-org/gitlab@master 2020-12-08 09:09:41 +00:00
GitLab Bot 678e8181aa Add latest changes from gitlab-org/gitlab@master 2020-11-17 00:09:16 +00:00
GitLab Bot 1fdf76252e Add latest changes from gitlab-org/gitlab@master 2020-11-12 09:08:57 +00:00
GitLab Bot ce5fc4c88d Add latest changes from gitlab-org/gitlab@master 2020-11-07 03:09:23 +00:00
GitLab Bot f3db01da50 Add latest changes from gitlab-org/gitlab@master 2020-11-06 18:09:07 +00:00
GitLab Bot a97f1426db Add latest changes from gitlab-org/gitlab@master 2020-11-02 21:09:10 +00:00
GitLab Bot 94823a9248 Add latest changes from gitlab-org/gitlab@master 2020-11-02 09:08:35 +00:00
GitLab Bot 98d7cc758f Add latest changes from gitlab-org/gitlab@master 2020-10-30 18:08:56 +00:00
GitLab Bot caafd2e499 Add latest changes from gitlab-org/gitlab@master 2020-10-26 21:08:22 +00:00
GitLab Bot 589b674b06 Add latest changes from gitlab-org/gitlab@master 2020-10-19 15:08:58 +00:00
GitLab Bot 3940f59a61 Add latest changes from gitlab-org/gitlab@master 2020-10-16 15:08:46 +00:00
GitLab Bot 9c72b346ac Add latest changes from gitlab-org/gitlab@master 2020-10-15 09:08:41 +00:00
GitLab Bot 16515bdfcb Add latest changes from gitlab-org/gitlab@master 2020-10-13 15:08:53 +00:00
GitLab Bot c02e2a5ef6 Add latest changes from gitlab-org/gitlab@master 2020-10-09 00:08:41 +00:00
GitLab Bot 6092dcc437 Add latest changes from gitlab-org/gitlab@master 2020-10-02 12:09:03 +00:00
GitLab Bot dc86d5615e Add latest changes from gitlab-org/gitlab@master 2020-09-18 12:09:50 +00:00
GitLab Bot 692f4b734f Add latest changes from gitlab-org/gitlab@master 2020-09-03 21:08:18 +00:00
GitLab Bot 08b3b98051 Add latest changes from gitlab-org/gitlab@master 2020-09-01 12:11:01 +00:00
GitLab Bot 184906087f Add latest changes from gitlab-org/gitlab@master 2020-08-31 00:10:37 +00:00
GitLab Bot aca89cb7e9 Add latest changes from gitlab-org/gitlab@master 2020-08-04 15:09:27 +00:00
GitLab Bot ed00b1a6a3 Add latest changes from gitlab-org/gitlab@master 2020-07-28 12:09:49 +00:00
GitLab Bot ce34395e91 Add latest changes from gitlab-org/gitlab@master 2020-07-13 12:09:18 +00:00
GitLab Bot c59765a50a Add latest changes from gitlab-org/gitlab@master 2020-06-24 18:09:03 +00:00
GitLab Bot c6e6762bbf Add latest changes from gitlab-org/gitlab@master 2020-06-01 09:08:28 +00:00
GitLab Bot a5650b86b5 Add latest changes from gitlab-org/gitlab@master 2020-05-13 21:08:55 +00:00
GitLab Bot 3aeda4e614 Add latest changes from gitlab-org/gitlab@master 2020-04-30 21:09:47 +00:00
GitLab Bot b71a496c7a Add latest changes from gitlab-org/gitlab@master 2020-04-15 03:09:11 +00:00
GitLab Bot 132dd28342 Add latest changes from gitlab-org/gitlab@master 2020-03-28 09:08:30 +00:00
GitLab Bot 6f2065c468 Add latest changes from gitlab-org/gitlab@master 2020-03-25 15:07:47 +00:00
GitLab Bot 76e9fc7b29 Add latest changes from gitlab-org/gitlab@master 2020-03-11 18:09:23 +00:00
GitLab Bot 1fa79760ad Add latest changes from gitlab-org/gitlab@master 2020-03-10 12:08:16 +00:00
GitLab Bot 22e9af3c8b Add latest changes from gitlab-org/gitlab@master 2020-01-27 12:08:35 +00:00
GitLab Bot a5ab3467a7 Add latest changes from gitlab-org/gitlab@master 2020-01-13 15:07:53 +00:00
GitLab Bot 7f8330873c Add latest changes from gitlab-org/gitlab@master 2019-12-18 21:07:37 +00:00
GitLab Bot e723867717 Add latest changes from gitlab-org/gitlab@master 2019-12-17 18:07:48 +00:00
GitLab Bot d5b4360051 Add latest changes from gitlab-org/gitlab@master 2019-11-26 03:06:24 +00:00
GitLab Bot 34b3567c97 Add latest changes from gitlab-org/gitlab@master 2019-11-19 09:06:16 +00:00
GitLab Bot 2b3007dc96 Add latest changes from gitlab-org/gitlab@master 2019-09-20 18:06:35 +00:00
Robert Speicher b51770c66a Merge branch 'local-test-failures' into 'master'
git-user-related local test failures

See merge request gitlab-org/gitlab-ce!31437
2019-08-29 14:27:05 +00:00
Thong Kuah 8c42a0eac0 Add frozen_string_literal to lib part 2
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-08-23 00:15:24 +12:00
David H. Wilkins 6391eeec30 git-user-related local test failures
Some of the tests fail locally due to the git user being different
than it is on the test runners.   I'd really like to be able to run
all of the tests locally.
2019-08-02 18:18:09 -05:00
Stan Hu 01203e7188 Fix health checks not working behind load balancers
The change in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24199 caused
requests coming from a load balancer to arrive as 127.0.0.1 instead of
the actual IP.

`Rack::Request#ip` behaves slightly differently different than
`ActionDispatch::Request#remote_ip`: the former will return the first
X-Forwarded-For IP if all of the IPs are trusted proxies, while the
second one filters out all proxies and falls back to REMOTE_ADDR, which
is 127.0.0.1.

For now, we can revert back to using `Rack::Request` because these
middlewares don't manipulate parameters. The actual fix problem involves
fixing Rails: https://github.com/rails/rails/issues/28436.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58573
2019-03-12 12:46:40 -07:00
Ash McKenzie c0a5b628c8
Allow sidekiq admin requests, regardless of root 2019-01-16 19:14:46 +11:00
Stan Hu 7d28e39f58 Fix multipart attachments not uploading
Mixing and matching the use of Rack::Request and ActionDispatch::Request
in Rails 5 is bad, particularly if you have middleware that
manipulates or accesses environment variables.

`Gitlab::Middleware::Multipart` attempts to rewrite request parameters
to the proper values (e.g. replacing `data_file` with
`UploadedFile`). It does this by calling `Rack::Request#update_params`,
which essentially updates `env['rack.request.form_hash']`.

By changing to `ActionDispatch::Request`, the Go middleware was causing
the request parameters to be stored inside
`env['action_dispatch.request.request_parameters']`. Later calls to
`Rack::Request#update_params` would not have any effect because it would
attempt to update `env['rack.request.form_has']` instead of
`env['action_dispatch.request.request_parameters']`. As a result, the
controller still saw the old parameters.

Since the Go middleware appears to be using `ActionDispatch::Request`
for authorization methods, we can switch the multipart middleware to
use it too.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9035
2019-01-05 01:56:47 -08:00
mortyccp 0e061adfcb Fix lint errors 2019-01-03 20:28:02 +08:00