delta/gitlab/gitlab-ce.git/lib, branch diff-parse-first-commit

Merge branch 'master' into diff-parse-first-commit

2016-01-14T12:11:12+00:00

Properly generate diff of orphan commits, like the first commit in a repository

2016-01-14T12:09:36+00:00

Merge branch 'master' into ci/api-variables

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

fixed LDAP activation on login to use new ldap_blocked state

2016-01-14T05:31:27+00:00

Merge branch '8-4-stable' into ci/api-variables

2016-01-13T22:59:00+00:00

* 8-4-stable: (285 commits)
  Add Changelog entry for build traces data integrity fix
  Update doc_styleguide.md [ci skip]
  Added hint that you can search users by name, username, or email.
  Add changelog
  Version 8.4.0.rc1
  Randomize metrics sample intervals
  Make the metrics sampler interval configurable
  Don't automatically require awesome_print
  Disable colorization if STDOUT is not a tty
  Block the reported user before destroying the record
  changes `$quote-gray` to `$secondary-text`
  makes message plural for multiple MRs and removes from loop. Duh.
  Prepare Installation and Update docs for 8.4 RC1
  Mention channel/key bug in irkerd docs
  Revert "Remove the `:coffee` and `:coffeescript` Haml filters"
  gets merge request discussion working again
  adds back in discussion.haml.html for issues commenting and closing/reopening properly.
  removing last chunk of MR ajax changes, rest will be in another MR
  reverting more MR ajax files, will appear in different commit
  reverting MR ajax changes, which will be in a different MR
  ...

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/private-references

2016-01-13T18:46:38+00:00

Ensure the API doesn't return notes that the current user shouldn't see

2016-01-13T18:42:36+00:00

Fix some typos

2016-01-13T17:47:39+00:00

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

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


See merge request !2406