Commit graph

17 commits

Author SHA1 Message Date
GitLab Bot
6d59e98918 Add latest changes from gitlab-org/gitlab@master 2019-10-18 18:06:21 +00:00
GitLab Bot
b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Robert Speicher
7698d40550
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2019-08-29 17:17:37 -05: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
Robert Schilling
cc18c332e0 Add test, reduce complexity 2019-08-22 19:39:11 +02:00
Robert Schilling
30f302d2be Don't check external authorization when disabling the service 2019-08-22 16:42:02 +02:00
Reuben Pereira
f5213a38cc Add prometheus listen address to whitelist
- Add to whitelist so that even if local requests from hooks and
services are not allowed, the prometheus manual configuration will
still succeed.
2019-07-31 17:38:15 +00: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
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
Andrew Newdigate
3288e1a874 Adds the Rubocop ReturnNil cop
This style change enforces `return if ...` instead of
`return nil if ...` to save maintainers a few minor review points
2019-03-06 17:51:56 +02:00
Jan Provaznik
a415a904b8 Ask user explicitly about usage stats agreement 2018-09-07 14:32:28 +00:00
gfyoung
265478ad74 Enable frozen string in apps/services/**/*.rb
For directories application_settings --> labels.

Partially addresses #47424.
2018-07-16 12:36:41 -07:00
Mario de la Ossa
c75baaa4ba
Backport changes in app/services/application_settings/update_service.rb 2018-06-04 13:37:43 -06:00
Rémy Coutable
2b8eb7273e
Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-29 10:38:59 +02:00
Bob Van Landuyt
3d6d0a09b6 Store application wide terms
This allows admins to define terms in the application settings.

Every time the terms are adjusted, a new version is stored and becomes
the 'active' version. This allows tracking which specific version was
accepted by a user.
2018-05-04 13:52:55 +02:00
Oswaldo Ferreira
ae057666bf EE backport for new application settings service 2017-01-23 16:22:33 -02:00