delta/gitlab/gitlab-ce.git/app/controllers/admin, branch docs_refactor gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'feature/ldap-sync-edgecases' into 'master' 2016-01-14T11:00:08+00:00 Douwe Maan douwe@gitlab.com 2016-01-14T11:00:08+00:00 4d64a32c88dd5f87621d391c0f10f6acef094073 LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242 

LDAP Sync blocked user edgecases

Allow GitLab admins to block otherwise valid GitLab LDAP users
(https://gitlab.com/gitlab-org/gitlab-ce/issues/3462)

Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other.

Expected behavior:

- [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?`
- [x] "ldap_blocked" users can't be unblocked by the Admin UI
- [x] "ldap_blocked" users can't be unblocked by the API
- [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked"
- [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization
- [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked`
 
Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users:
![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png)

There will be another MR for the EE version.

See merge request !2242
 Broadcast Messages can now be edited 2016-01-13T16:42:15+00:00 Robert Speicher rspeicher@gmail.com 2015-12-31T22:55:14+00:00 00e8700433b3b1ad11252448af5be58913539d85 Closes #3046 
Closes #3046
Remove alert_type attribute from BroadcastMessage 2016-01-13T16:34:57+00:00 Robert Speicher rspeicher@gmail.com 2015-12-31T20:56:15+00:00 6ae39c2cd1edcc845136739d42baf032120e3ddc 






Merge branch 'configure-randomize-metrics-sample-interval' into 'master'

2016-01-13T14:54:45+00:00

Yorick Peterse
yorickpeterse@gmail.com

2016-01-13T14:54:45+00:00

b7f49aa0f0cbcd699396799fd746fa4f5735a250


See merge request !2406





See merge request !2406






Make the metrics sampler interval configurable
2016-01-13T11:29:48+00:00

Yorick Peterse
yorickpeterse@gmail.com

2016-01-13T11:29:48+00:00

23671600150cb022a09a77b8ea56a9465f19a013












Block the reported user before destroying the record
2016-01-13T01:59:55+00:00

Robert Speicher
rspeicher@gmail.com

2016-01-13T01:48:16+00:00

da40274fdc60fe17f928b80eb71c211e27523d5e

This is intended to prevent the user from creating new objects while the
transaction that removes them is being run, resulting in objects with
nil authors which can then not be edited.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117





This is intended to prevent the user from creating new objects while the
transaction that removes them is being run, resulting in objects with
nil authors which can then not be edited.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117







Code style fixes and some code simplified
2016-01-08T18:26:04+00:00

Gabriel Mazetto
gabriel@gitlab.com

2016-01-07T16:01:01+00:00

47e4613f4adc2d6ef4b066a87ec772ef8044bdd5












Repair ldap_blocked state when no ldap identity exist anymore
2016-01-08T18:26:04+00:00

Gabriel Mazetto
gabriel@gitlab.com

2016-01-06T07:38:52+00:00

ec67e9be1d7486199b47e19c766202a8bfdefe93












Prevent ldap_blocked users from being unblocked by the Admin UI
2016-01-08T18:26:04+00:00

Gabriel Mazetto
gabriel@gitlab.com

2015-12-29T20:58:38+00:00

ba9855d4877998e3574907cc542fcab15a9d1353












Remove InfluxDB username/password
2016-01-06T16:49:56+00:00

Yorick Peterse
yorickpeterse@gmail.com

2016-01-06T16:49:02+00:00

8fdc00bd4c59183a20a60a6b93228268230bbd2e

InfluxDB over UDP doesn't use authentication, thus there's no need for
these settings.





InfluxDB over UDP doesn't use authentication, thus there's no need for
these settings.