Douwe Maan 4d64a32c88 Merge branch 'feature/ldap-sync-edgecases' into 'master' ... 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:  There will be another MR for the EE version. See merge request !2242		2016-01-14 11:00:08 +00:00
..
avatar.scss
blocks.scss	Fix typo in js method and some repeating css	2016-01-07 15:16:12 +01:00
buttons.scss	Fix Admin/Users view to position buttons without spacing magic	2016-01-14 03:08:40 -02:00
calendar.scss	Update cal-heatmap style overrides	2016-01-01 22:12:50 -05:00
callout.scss	Use consistent padding for .gitlab-ci.yml info callouts	2015-12-08 13:06:53 +01:00
common.scss	moves border bottom to left-menu-top class.	2015-12-23 10:41:29 -05:00
files.scss	Merge branch 'ui-framework-fixes'	2015-12-08 18:57:43 +01:00
filters.scss
flash.scss	Fix award-emojis alert flash message	2015-12-11 13:50:14 +01:00
fonts.scss	Use WOFF versions of SourceSansPro	2016-01-09 16:05:53 -05:00
forms.scss	Style the broadcast message form	2016-01-13 11:34:19 -05:00
gfm.scss
gitlab-theme.scss
header.scss	Fix logo height in signed-out header bar	2015-12-02 14:05:24 +01:00
highlight.scss
issue_box.scss	new button sizes	2015-12-23 16:25:42 +01:00
jquery.scss
layout.scss	new-colors	2015-12-18 15:25:12 +01:00
lists.scss	makes message plural for multiple MRs and removes from loop. Duh.	2016-01-12 20:49:43 -05:00
markdown_area.scss	Rename .issuable-details to .detail-page (and -header and -description)	2015-12-16 16:13:22 +01:00
mixins.scss	new colors	2015-12-21 16:10:03 +01:00
mobile.scss	adds css for left-top-menu. Also hides buttons in certain for factors.	2015-12-23 09:00:59 -05:00
pagination.scss	Improve UI for group members page	2015-11-25 10:24:29 +01:00
panels.scss	Fix inline panel heading height	2015-12-15 17:31:07 +01:00
selects.scss	Implement new sidebar for merge request page	2015-12-11 20:11:23 +01:00
sidebar.scss	Use the logo as a loading indicator	2016-01-02 15:43:02 -05:00
tables.scss	Use gl-padding instead of 15px/20px where appropriate	2015-12-02 14:46:15 +01:00
timeline.scss	Fix double border in MR discussion	2015-12-16 15:41:50 +01:00
tw_bootstrap.scss	Fix CSS styling for clipboard icon in new MR page	2015-11-22 07:23:56 -08:00
tw_bootstrap_variables.scss
typography.scss	markdown fixes	2016-01-05 10:51:59 +01:00
variables.scss	changes $quote-gray to $secondary-text	2016-01-12 20:51:13 -05:00
zen.scss	Refactor ZenMode	2016-01-08 23:36:09 -05:00