Document the Active Directory magic numbers
Improve ad_disabled method name
Merge branch 'ad_disabled_users' into 'master'

Block 'disabled' AD users over SSH

The existing SSH access check for LDAP users ignored the ActiveDirectory 'disabled' flag.
Add CHANGELOG entry for the AD disabled flag
Add test for current behavior of current_user
Move user access check to Gitlab::UserAccess
Check user access status in API for current_user
Make user access test pass for the right reason

If we do not set a private token during the test, current_user will be
nil because the user is not found, not due to the access check.
Add API access checks to CHANGELOG
Hide control elements and last login for xs display

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Hide group dashboard and project sidebar for xs size

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'mobile-ui-improvements' into 'master'

Mobile ui improvements

* Fixes blob view - https://twitter.com/jamesgecko/status/466675058664951808
* Hide project sidebar for xs
* Hide group activity for xs
Merge branch 'api_ldap' into 'master'

Check user access during API calls
Merge branch 'ad_disabled_changelog'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
merge into current master
Update ability to search in issue descriptions and comments
Fixes a problem with 'Issues' filter box, where description of the filter says 'Filter by title or description' but in fact filter only works for title and doesn't work for description
Remove logrotate step (no change in 6.8)
Clean up *.log.1 files during 6.6-to-6.7 upgrade