delta/gitlab/gitlab-ce.git/app/controllers/admin, branch fix-diff-comments

Merge branch 'feature/check-against-rbl-only' into 'master'

2016-01-20T19:24:20+00:00

Split from !2455

References #9092

See merge request !2515

Add IP blocking against DNSBL at sign-up

2016-01-20T14:28:19+00:00

Add sentry integration

2016-01-18T16:15:10+00:00

Merge branch 'feature/ldap-sync-edgecases' into 'master'

2016-01-14T11:00:08+00:00


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

Closes #3046

Remove alert_type attribute from BroadcastMessage

2016-01-13T16:34:57+00:00

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

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


See merge request !2406

Make the metrics sampler interval configurable

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

Block the reported user before destroying the record

2016-01-13T01:59:55+00:00

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