delta/gitlab/gitlab-ce.git/app/views/admin, branch ruby_version

Merge branch 'remove-gray-bg'

2016-01-14T13:09:49+00:00

Signed-off-by: Dmitriy Zaporozhets

Improvements, readability for artifacts browser

2016-01-14T11:48:16+00:00

Update specs for CI Build, add `artifacts?` method

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

`artifacts?` method checks if artifacts archive is available.

Rename method that returns url to CI build artifacts download

2016-01-14T11:48:14+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

Fix Admin/Users view to position buttons without spacing magic

2016-01-14T05:08:40+00:00

Remove (invalid) timestamp formatting

2016-01-13T17:01:58+00:00

Move `BroadcastMessage#status` to a helper since it's presentational

2016-01-13T16:49:59+00:00

Broadcast Messages can now be edited

2016-01-13T16:42:15+00:00

Closes #3046

Move broadcast message form to a partial

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