Commit Graph

100 Commits

Author SHA1 Message Date
GitLab Bot 3cccd102ba Add latest changes from gitlab-org/gitlab@14-10-stable-ee 2022-04-20 10:00:54 +00:00
GitLab Bot a7b3560714 Add latest changes from gitlab-org/gitlab@14-8-stable-ee 2022-02-18 09:45:46 +00:00
GitLab Bot aee0a117a8 Add latest changes from gitlab-org/gitlab@14-6-stable-ee 2021-12-20 13:37:47 +00:00
GitLab Bot d9ab72d608 Add latest changes from gitlab-org/gitlab@14-4-stable-ee 2021-10-20 08:43:02 +00:00
GitLab Bot 0653e08efd Add latest changes from gitlab-org/gitlab@14-3-stable-ee 2021-09-20 13:18:24 +00:00
GitLab Bot b76ae63846 Add latest changes from gitlab-org/gitlab@14-2-stable-ee 2021-08-19 09:08:42 +00:00
GitLab Bot e8d2c25793 Add latest changes from gitlab-org/gitlab@14-1-stable-ee 2021-07-20 09:55:51 +00:00
GitLab Bot a5f4bba440 Add latest changes from gitlab-org/gitlab@14-0-stable-ee 2021-06-16 18:25:58 +00:00
GitLab Bot 4555e1b21c Add latest changes from gitlab-org/gitlab@13-12-stable-ee 2021-05-19 15:44:42 +00:00
GitLab Bot 9dc93a4519 Add latest changes from gitlab-org/gitlab@13-11-stable-ee 2021-04-20 23:50:22 +00:00
GitLab Bot f64a639bcf Add latest changes from gitlab-org/gitlab@13-10-stable-ee 2021-03-16 18:18:33 +00:00
GitLab Bot 859a6fb938 Add latest changes from gitlab-org/gitlab@13-9-stable-ee 2021-02-18 10:34:06 +00:00
Robert Speicher 6438df3a1e
Add latest changes from gitlab-org/gitlab@13-8-stable-ee 2021-01-20 13:34:23 -06:00
GitLab Bot 8b573c9489 Add latest changes from gitlab-org/gitlab@13-7-stable-ee 2020-12-17 11:59:07 +00:00
GitLab Bot 7e9c479f7d Add latest changes from gitlab-org/gitlab@13-6-stable-ee 2020-11-19 08:27:35 +00:00
GitLab Bot 48aff82709 Add latest changes from gitlab-org/gitlab@13-5-stable-ee 2020-10-21 07:08:36 +00:00
GitLab Bot 85dc423f70 Add latest changes from gitlab-org/gitlab@13-4-stable-ee 2020-09-19 01:45:44 +00:00
GitLab Bot 37e3c3bb33 Add latest changes from gitlab-org/gitlab@13-2-stable-ee 2020-07-29 19:57:17 +00:00
GitLab Bot a09983ae35 Add latest changes from gitlab-org/gitlab@13-2-stable-ee 2020-07-20 12:26:25 +00:00
GitLab Bot 8c7f4e9d5f Add latest changes from gitlab-org/gitlab@13-1-stable-ee 2020-06-18 11:18:50 +00:00
GitLab Bot 9f46488805 Add latest changes from gitlab-org/gitlab@13-0-stable-ee 2020-05-20 14:34:42 +00:00
GitLab Bot b806264d29 Add latest changes from gitlab-org/gitlab@master 2020-01-16 09:08:46 +00:00
GitLab Bot 6ede90f5dd Add latest changes from gitlab-org/gitlab@master 2020-01-13 06:08:10 +00:00
GitLab Bot eca3cd3a9e Add latest changes from gitlab-org/gitlab@master 2019-11-15 18:06:24 +00:00
GitLab Bot 3318518149 Add latest changes from gitlab-org/gitlab@master 2019-11-13 15:07:29 +00:00
GitLab Bot 6d31b8f052 Add latest changes from gitlab-org/gitlab@master 2019-11-12 18:06:57 +00:00
GitLab Bot ae72d71da8 Add latest changes from gitlab-org/gitlab@master 2019-11-08 21:06:38 +00:00
GitLab Bot 1ef4b65f55 Add latest changes from gitlab-org/gitlab@master 2019-11-08 06:06:24 +00:00
GitLab Bot 8f210aebe1 Add latest changes from gitlab-org/gitlab@master 2019-10-31 21:06:28 +00:00
GitLab Bot d5e0416021 Add latest changes from gitlab-org/gitlab@master 2019-10-22 21:06:42 +00:00
GitLab Bot 6b75320f52 Add latest changes from gitlab-org/gitlab@master 2019-10-17 12:07:33 +00:00
GitLab Bot 8e45d25f7d Add latest changes from gitlab-org/gitlab@master 2019-10-16 18:08:01 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Mathieu Parent 85776fa3ff Settings API: domain_{black,white}list should be arrays
As in documentation.

Fixes: #58180.

Also remove the requirement between domain_blacklist_enabled and domain_blacklist.
2019-09-09 15:14:52 +02:00
Mathieu Parent d5978d0921 App settings: Allow all import sources from API 2019-09-09 15:11:33 +02:00
GitLab Release Tools Bot 090956259c Merge branch 'security-enable-image-proxy' into 'master'
Use image proxy to mitigate stealing ip addresses

Closes #2812

See merge request gitlab/gitlabhq!2926
2019-08-29 21:34:29 +00:00
GitLab Release Tools Bot a5b2a37860 Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'
Require a captcha after unique failed logins from the same IP

See merge request gitlab/gitlabhq!3270
2019-08-29 21:34:12 +00:00
Brett Walker ad05e48863 Add support for using a Camo proxy server
User images and videos will get proxied through
the Camo server in order to keep malicious
sites from collecting the IP address of users.
2019-08-23 23:44:53 -05:00
Jeremy Jackson 5d9d5e6031 Migrates Snowplow backend from EE to CE
This introduces several changes, but these are all just ported from the
EE project.
2019-08-14 19:21:58 +00:00
George Koltsov 5e3a208f58 Add backwards compatibility for legacy setting
`allow_local_requests_for_hooks_and_services` was renamed to
`allow_local_requests_for_web_hooks_and_services`.
2019-08-02 15:39:18 +01:00
Małgorzata Ksionek dfcf4cf5f1 Add captcha if there are multiple failed login attempts
Add method to store session ids by ip

Add new specs for storing session ids

Add cleaning up records after login

Add retrieving anonymous sessions

Add login recaptcha setting

Add new setting to sessions controller

Add conditions for showing captcha

Add sessions controller specs

Add admin settings specs for login protection

Add new settings to api

Add stub to devise spec

Add new translation key

Add cr remarks

Rename class call

Add cr remarks

Change if-clause for consistency

Add cr remarks

Add code review remarks

Refactor AnonymousSession class

Add changelog entry

Move AnonymousSession class to lib

Move store unauthenticated sessions to sessions controller

Move link to recaptcha info

Regenerate text file

Improve copy on the spam page

Change action filter for storing anonymous sessions

Fix rubocop offences

Add code review remarks
2019-07-31 11:47:55 +02:00
Diego Louzán e20538088b Add support page link in help menu
Creates a new item in help dropdown to show configured support page link
2019-07-30 17:03:17 +00:00
Maneschi Romain def94f5043 Add Grafana to Admin > Monitoring menu when enabled 2019-07-03 16:09:51 +00:00
Roger Meier 946ffc67b7 refactor: remove Sentry from application settings 2019-06-25 21:17:19 +02:00
Imre Farkas 72e1123691 CE port of Move EE specific lines in API::Settings 2019-05-30 21:53:25 +00:00
Mario de la Ossa 03608aa103
Backport of 328-versioned-es-schema 2019-05-02 22:22:45 -06:00
Imre Farkas 9bc5ed14fe Move Contribution Analytics related spec in spec/features/groups/group_page_with_external_authorization_service_spec to EE 2019-04-09 15:38:58 +00:00
Gosia Ksionek 64858317ad Add part of needed code
Add columns to store project creation settings

Add project creation level column in groups
 and default project creation column in application settings

Remove obsolete line from schema

Update migration with project_creation_level column existence check

Rename migrations to avoid conflicts

Update migration methods

Update migration method
2019-04-05 18:49:46 +00:00
Andreas Brandl 46b1b9c1d6 Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
This reverts merge request !26823
2019-04-05 13:02:56 +00:00
Imre Farkas d9d7237d2e Move Contribution Analytics related spec in spec/features/groups/group_page_with_external_authorization_service_spec to EE 2019-04-05 11:45:47 +00:00