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

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

Update to Go 1.5.3

2016-01-14T01:21:37+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
  ...

Add some cosmetic changes to variables API documentation [ci skip]

2016-01-13T22:16:10+00:00

Modify builds API documentation style [ci skip]

2016-01-13T19:23:48+00:00

Merge branch 'doc_styleguide' into 'master'

2016-01-13T18:04:14+00:00


Move doc_styleguide in the development directory

Reference #3841 

And also add many new styleguides:

- Naming
- Images
- Links
- Headings
- Formatting
- Notes
- API

See merge request !2386

Add 'Build' prefix to Variables entry name in API docs index

2016-01-13T17:51:27+00:00

Update doc_styleguide.md [ci skip]

2016-01-13T17:24:08+00:00

- Fix some syntax/grammar typos
- Link to GFM documentation on newlines
- Be less strict on the alphabetical order styleguide
- You can override the "numbers in headings" rule if you discuss it first
- Do not mention CE in notes if the feature is in both CE and EE

Merge branch 'ci/api-projects' into 'master'

2016-01-13T13:32:35+00:00


Extend projects API with CI data

Reference #4264 

See merge request !2303