Commit Graph

418 Commits

Author SHA1 Message Date
GitLab Bot 2e31c85a97 Add latest changes from gitlab-org/gitlab@master 2020-03-18 00:09:16 +00:00
GitLab Bot dc889678d1 Add latest changes from gitlab-org/gitlab@master 2020-03-12 15:09:39 +00:00
GitLab Bot afe2b98452 Add latest changes from gitlab-org/gitlab@master 2020-03-05 15:07:52 +00:00
GitLab Bot 00bd11b166 Add latest changes from gitlab-org/gitlab@master 2020-03-05 06:07:51 +00:00
GitLab Bot 988b28ec1a Add latest changes from gitlab-org/gitlab@master 2020-03-02 12:07:57 +00:00
GitLab Bot b042382bbf Add latest changes from gitlab-org/gitlab@master 2020-02-05 18:09:06 +00:00
GitLab Bot ca05512007 Add latest changes from gitlab-org/gitlab@master 2020-02-04 18:08:50 +00:00
GitLab Bot 88a0824944 Add latest changes from gitlab-org/gitlab@master 2020-02-04 12:09:00 +00:00
GitLab Bot c8f773a859 Add latest changes from gitlab-org/gitlab@master 2020-01-30 21:08:47 +00:00
GitLab Bot 6b9d3a4e83 Add latest changes from gitlab-org/gitlab@master 2020-01-29 18:08:47 +00:00
GitLab Bot 3f9e1b2611 Add latest changes from gitlab-org/gitlab@master 2020-01-23 15:08:46 +00:00
GitLab Bot 511e761b41 Add latest changes from gitlab-org/gitlab@master 2020-01-03 15:08:33 +00:00
GitLab Bot d10a462fed Add latest changes from gitlab-org/gitlab@master 2019-12-16 12:07:43 +00:00
GitLab Bot 8cc5f27909 Add latest changes from gitlab-org/gitlab@master 2019-12-13 12:07:41 +00:00
GitLab Bot 2e3cbf7d89 Add latest changes from gitlab-org/gitlab@master 2019-12-12 00:07:43 +00:00
GitLab Bot b86f474bf5 Add latest changes from gitlab-org/gitlab@master 2019-12-11 12:08:10 +00:00
GitLab Bot 4529c19950 Add latest changes from gitlab-org/gitlab@master 2019-12-03 21:06:23 +00:00
GitLab Bot ab7cf450ba Add latest changes from gitlab-org/gitlab@master 2019-12-03 18:06:49 +00:00
GitLab Bot 16d9f66e96 Add latest changes from gitlab-org/gitlab@master 2019-11-18 12:06:03 +00:00
GitLab Bot 190e204dec Add latest changes from gitlab-org/gitlab@master 2019-11-17 12:06:19 +00:00
GitLab Bot 4f01ac5ba0 Add latest changes from gitlab-org/gitlab@master 2019-11-13 09:06:41 +00:00
GitLab Bot 69944ffb68 Add latest changes from gitlab-org/gitlab@master 2019-11-12 15:06:26 +00:00
GitLab Bot ae72d71da8 Add latest changes from gitlab-org/gitlab@master 2019-11-08 21:06:38 +00:00
GitLab Bot 759bab0585 Add latest changes from gitlab-org/gitlab@master 2019-11-08 15:06:21 +00:00
GitLab Bot 1ef4b65f55 Add latest changes from gitlab-org/gitlab@master 2019-11-08 06:06:24 +00:00
GitLab Bot 1adb4373ba Add latest changes from gitlab-org/gitlab@master 2019-11-08 00:05:58 +00:00
GitLab Bot d8ccc7a00b Add latest changes from gitlab-org/gitlab@master 2019-11-07 18:06:21 +00:00
Yorick Peterse ad8eea3834
Merge dev.gitlab.org@master into GitLab.com@master 2019-10-30 15:22:45 +01:00
GitLab Release Tools Bot a7329f4372 Merge branch 'security-remove-leaky-401-responses-master' into 'master'
Private/internal repository enumeration via bruteforce on a vulnerable URL

See merge request gitlab/gitlabhq!3454
2019-10-29 15:58:14 +00:00
GitLab Bot 6d43720a1a Add latest changes from gitlab-org/gitlab@master 2019-10-25 00:06:14 +00:00
GitLab Bot 4682f5015a Add latest changes from gitlab-org/gitlab@master 2019-10-18 21:06:37 +00:00
GitLab Bot 308146dc39 Add latest changes from gitlab-org/gitlab@master 2019-10-10 00:06:44 +00:00
Kerri Miller 8395032721 Avoid #authenticate_user! in #route_not_found
This method, #route_not_found, is executed as the final fallback for
unrecognized routes (as the name might imply.) We want to avoid
`#authenticate_user!` when calling `#route_not_found`;
`#authenticate_user!` can, depending on the request format, return a 401
instead of redirecting to a login page. This opens a subtle security
exploit where anonymous users will receive a 401 response when
attempting to access a private repo, while a recognized user will
receive a 404, exposing the existence of the private, hidden repo.
2019-10-09 10:47:45 -07:00
GitLab Bot ed3b169888 Add latest changes from gitlab-org/gitlab@master 2019-10-01 18:06:28 +00:00
GitLab Bot e08eba1838 Add latest changes from gitlab-org/gitlab@master 2019-09-28 00:06:20 +00:00
GitLab Bot 4309992515 Add latest changes from gitlab-org/gitlab@master 2019-09-26 21:06:29 +00:00
GitLab Bot 5707f305f4 Add latest changes from gitlab-org/gitlab@master 2019-09-26 12:06:00 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
dineshpanda 980303b542 Avoid calling freeze on already frozen strings in app/controllers 2019-09-01 01:57:25 +05:30
Grzegorz Bizon b1604f7d8f Merge branch '47003-user-onboarding-replace-current-email-confirmation-flow-with-a-soft-email-confirmation-flow' into 'master'
Soft email confirmation flow

Closes #47003

See merge request gitlab-org/gitlab-ce!31245
2019-08-16 12:31:16 +00:00
George Koltsov 2857a40950 Swap clauses as per code review suggestion 2019-08-15 10:11:35 +01:00
George Koltsov 10b2383f02 Exclude json content type from workhorse interception 2019-08-14 12:07:42 +01:00
Alex Buijs 2bc0f0cfcf
Add ConfirmEmailWarning concern 2019-08-08 13:34:11 +02:00
Heinrich Lee Yu 1ce5bcacdb Remove code related to object hierarchy in MySQL
These are not required because MySQL is not
supported anymore
2019-07-25 15:35:06 +08:00
manojmj 3c9d75e045 CE Port: Log impersonation actions in audit log
This change adds audit logs for user impersonation
when an admin starts/stops impersonating
another user.
2019-07-23 11:44:09 +05:30
Stan Hu ee791d3f40 Enable Gitaly ref caching for SearchController
As we noticed in
https://gitlab.com/gitlab-org/gitlab-ce/issues/56627#note_185828742,
clicking on the "Issues" tab often requests the same reference in
rendering Markdown.
2019-06-26 16:24:46 -07:00
James Edwards-Jones 866f544c3e Avoid setting Gitlab::Session on sessionless requests 2019-06-05 19:07:20 +01:00
Bob Van Landuyt 589b2db06c Setup Phabricator import
This sets up all the basics for importing Phabricator tasks into
GitLab issues.

To import all tasks from a Phabricator instance into GitLab, we'll
import all of them into a new project that will have its repository
disabled.

The import is hooked into a regular ProjectImport setup, but similar
to the GitHub parallel importer takes care of all the imports itself.

In this iteration, we're importing each page of tasks in a separate
sidekiq job.

The first thing we do when requesting a new page of tasks is schedule
the next page to be imported. But to avoid deadlocks, we only allow a
single job per worker type to run at the same time.

For now we're only importing basic Issue information, this should be
extended to richer information.
2019-05-31 09:40:54 +02:00
James Edwards-Jones 5faa98f481 Session stored globally per request
- This can be accessed with Session.current and is restored after.
- Data can be stored under a key with NamespacedSessionStore
2019-05-02 12:28:26 +07:00
Andrew Newdigate 4f4de36cac Migrate correlation and tracing code to LabKit
This change is a fairly straightforward refactor to extract the tracing
and correlation-id code from the gitlab rails codebase into the new
LabKit-Ruby project.

The corresponding import into LabKit-Ruby was in
https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1

The code itself remains very similar for now.

Extracting it allows us to reuse it in other projects, such as
Gitaly-Ruby. This will give us the advantages of correlation-ids and
distributed tracing in that project too.
2019-04-18 09:57:16 +02:00