b806264d29
Add latest changes from gitlab-org/gitlab@master
2020-01-16 09:08:46 +00:00
6ede90f5dd
Add latest changes from gitlab-org/gitlab@master
2020-01-13 06:08:10 +00:00
eca3cd3a9e
Add latest changes from gitlab-org/gitlab@master
2019-11-15 18:06:24 +00:00
3318518149
Add latest changes from gitlab-org/gitlab@master
2019-11-13 15:07:29 +00:00
6d31b8f052
Add latest changes from gitlab-org/gitlab@master
2019-11-12 18:06:57 +00:00
ae72d71da8
Add latest changes from gitlab-org/gitlab@master
2019-11-08 21:06:38 +00:00
1ef4b65f55
Add latest changes from gitlab-org/gitlab@master
2019-11-08 06:06:24 +00:00
8f210aebe1
Add latest changes from gitlab-org/gitlab@master
2019-10-31 21:06:28 +00:00
d5e0416021
Add latest changes from gitlab-org/gitlab@master
2019-10-22 21:06:42 +00:00
6b75320f52
Add latest changes from gitlab-org/gitlab@master
2019-10-17 12:07:33 +00:00
8e45d25f7d
Add latest changes from gitlab-org/gitlab@master
2019-10-16 18:08:01 +00:00
b7dfe2ae40
Add latest changes from gitlab-org/gitlab@master
2019-09-13 13:26:31 +00:00
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
d5978d0921
App settings: Allow all import sources from API
2019-09-09 15:11:33 +02:00
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
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
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
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
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
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
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
def94f5043
Add Grafana to Admin > Monitoring menu when enabled
2019-07-03 16:09:51 +00:00
946ffc67b7
refactor: remove Sentry from application settings
2019-06-25 21:17:19 +02:00
72e1123691
CE port of Move EE specific lines in API::Settings
2019-05-30 21:53:25 +00:00
03608aa103
Backport of 328-versioned-es-schema
2019-05-02 22:22:45 -06:00
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
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
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
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
30fb9fffec
Backport API parameters for API::Settings
...
This backports the API parameters from API::Settings that were added in
EE, wrapping them in a conditional.
2019-03-26 14:18:29 +01:00
85f11eff9b
Refactor API::Settings for EE
...
This refactors API::Settings so that EE can more easily extend its
behaviour, without having to modify the CE source code directly.
2019-03-04 17:44:57 +01:00
433bcf9b04
Add local markdown version
...
Cached markdown version is composed both from global and local
markdown version. This allows admins to bump version locally when
needed (e.g. when external URL is changed).
2019-02-06 19:46:59 +01:00
7be192803c
API: Fix default branch protection setting for Admin API
2019-01-15 19:05:39 +00:00
656831e173
Remove Koding integration and documentation
...
This integration no longer works and does not appear to be supported.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
2018-10-12 22:18:51 -07:00
3836d69119
Enable frozen string in lib/api and lib/backup
...
Partially addresses #47424 .
Had to make changes to spec files because
stubbing methods on frozen objects is a mess
in RSpec and leads to failures:
https://github.com/rspec/rspec-mocks/issues/1190
2018-09-29 21:04:50 -07:00
2daa8d387b
Remove background job throttling feature
...
We remove this feature as it never worked properly
2018-09-24 18:41:14 +03:00
6876c7afa8
Fix grammar (setup to set-up) in code comments, spec, views, etc.
2018-09-17 09:17:33 +00:00
ea6fc714bb
Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'
...
Resolve "Making instance-wide data tools more accessible"
Closes #41416 and #48507
See merge request gitlab-org/gitlab-ce!20874
2018-08-01 15:17:47 +00:00
7af940e412
Fix a few disrepencies between CE and EE in the lines ordering
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-08-01 08:23:07 +02:00
1b27c45753
Merge branch 'master' into '41416-making-instance-wide-data-tools-more-accessible'
...
# Conflicts:
# app/models/application_setting.rb
# lib/api/settings.rb
2018-07-31 16:29:13 +00:00
76605174af
Updated application settings with minor fixes
2018-07-30 10:16:54 +00:00
0393a82d26
Add instance statistics settings to API
2018-07-27 15:54:29 +02:00
ed81ee9ba2
Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'"
...
This reverts merge request !20679
2018-07-27 13:12:35 +00:00
a79094b292
Add instance statistics settings to API
2018-07-27 14:14:47 +02:00
0f9dacf431
Fix icon for manifest import and mention manifest feature in API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-07-11 12:22:57 +03:00
c20766e808
Add missing usage_ping_enabled to API settings
...
Identified while resolving conflicts in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5906
2018-05-30 10:50:30 -07:00
e79f91df8c
Merge branch '46758-fallout-of-cacheable-attribute' into 'master'
...
Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache
Closes #46758
See merge request gitlab-org/gitlab-ce!19144
2018-05-29 15:42:59 +00:00
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
d6e3a6b5fb
include groups in description
2018-05-28 09:57:17 -06:00
a46929ea2f
Use ApplicationSetting.current_without_cache instead of ApplicationSetting.current where applicable
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-23 16:14:43 +02:00
GitLab Bot
Mathieu Parent
GitLab Release Tools Bot
Brett Walker
Jeremy Jackson
George Koltsov
Małgorzata Ksionek
Diego Louzán
Maneschi Romain
Roger Meier
Imre Farkas
Mario de la Ossa
Andreas Brandl
Yorick Peterse
Jan Provaznik
Robert Schilling
Stan Hu
gfyoung
Valery Sizov
Marcel Amirault
Filipa Lacerda
Rémy Coutable
Luke Bennett
Bob Van Landuyt
Sean McGivern
Dmitriy Zaporozhets
Douwe Maan
Davin Walker