delta/gitlab/gitlab-ce.git, 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 'ci/api-variables' into 'master'

2016-01-14T12:05:53+00:00


Add variables API

References #4264 

See merge request !2264

Merge branch 'fix/titles-weight' into 'master'

2016-01-14T11:47:21+00:00


Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages

See #3956.

Following is before/after for each page:

## Group title

### Before
![group-title-before](/uploads/d6c013c69f526d553555ff974c29b349/group-title-before.png)

### After
![group-title-after](/uploads/56e0bd176d12943297b5b95d20beb437/group-title-after.png)

---

## Commit title

### Before
![commit-title-before](/uploads/a9bda5212eea843ab4c92acbcf411cdd/commit-title-before.png)

### After
![commit-title-after](/uploads/e3a532460a1e7b0b2a8eb8a6af12abea/commit-title-after.png)

---

## Branch name

### Before
![branch-name-before](/uploads/9d77e39f07cd7b757d02a39f5bc57570/branch-name-before.png)

### After
![branch-name-after](/uploads/6831e9560d196d8a4da209166f224a0f/branch-name-after.png)

---

## Tags name in list

### Before
![tags-name-in-list-before](/uploads/cf0141713af751132fd29220621ea9ab/tags-name-in-list-before.png)

### After
![tags-name-in-list-after](/uploads/902c5b029dc832216ac536d2ad372b83/tags-name-in-list-after.png)

---

## Tag name

### Before
![tags-name-before](/uploads/495acb6b4bab8464a0ffeb8f703435b6/tags-name-before.png)

### After
![tags-name-after](/uploads/f86868dbad57b8226611bcb03e5a9524/tags-name-after.png)

---

## Issue title in list

### Before
![issue-title-in-list-before](/uploads/5f01450aceefdcc2f51984832a4ce6b5/issue-title-in-list-before.png)

### After
![issue-title-in-list-after](/uploads/3144fb231874d23b6b46e108da24b128/issue-title-in-list-after.png)

---

## MR title in list

### Before
![mr-title-in-list-before](/uploads/bd0239104ebf4a5090c724c3851df57c/mr-title-in-list-before.png)

### After
![mr-title-in-list-after](/uploads/16be5460dffc33ff173a6b8ff3250206/mr-title-in-list-after.png)

See merge request !2422

Fix version

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

Merge branch 'fix-safe-import-url' into 'master'

2016-01-14T10:53:13+00:00


Fix the undefinded variable error in Project's safe_import_url method

Fixes #7982

See merge request !2419

Merge branch 'fix/private-references' into 'master'

2016-01-14T10:36:39+00:00


Show referenced MRs & Issues only when the current viewer can access them

This addresses both issues identified in #6066.

## The private MR by user `remy2` with a note referencing to a public issue

![Screen_Shot_2016-01-12_at_16.45.02](/uploads/c245ec2c1fdea1f9ba05183c24e142d9/Screen_Shot_2016-01-12_at_16.45.02.png)

---

## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** before the fix

![Screen_Shot_2016-01-12_at_18.14.50](/uploads/8db5580e803f5bddd6cb935233c579a0/Screen_Shot_2016-01-12_at_18.14.50.png)

---

## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** with the fix

![Screen_Shot_2016-01-13_at_12.02.32](/uploads/cb199f7b78191fba486a11412412e307/Screen_Shot_2016-01-13_at_12.02.32.png)

---

## The public issue viewed by user `remy2` with the fix (no change)

![Screen_Shot_2016-01-13_at_11.54.06](/uploads/ddece590d69f597a95559beddcd36660/Screen_Shot_2016-01-13_at_11.54.06.png)


See merge request !2405

Merge branch 'rs-broadcasts' into 'master'

2016-01-14T10:34:56+00:00


Allow broadcast messages to be edited

Closes #3046 

See merge request !2268