delta/gitlab/gitlab-ce.git/lib, branch fix-diff-comments

Properly highlight right side of parallel diff

2016-01-22T01:12:43+00:00

Restore diff comments

2016-01-22T01:10:58+00:00

Merge branch 'workhorse-path' into 'master'

2016-01-21T16:07:21+00:00


Init script changes for gitlab-workhorse in 8.4

Goes with https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/31

Also bumps gitlab-workhorse to 0.6.1.

[ci skip]

See merge request !2529

Fix import of GitHub's wiki when the repository has not been created

2016-01-21T15:11:38+00:00

Init script changes for gitlab-workhorse in 8.4

2016-01-21T12:36:55+00:00

Merge branch 'ci/cache-key' into 'master'

2016-01-21T11:15:28+00:00


Added cache:key to .gitlab-ci.yml allowing to fine tune the caching

The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need:

1. Cache per-build for all branches:

```
cache:
    key: "$CI_BUILD_NAME"
    untracked: true
```

2. Cache per-branch for all jobs:

```
cache:
    key: "$CI_BUILD_REF"
    untracked: true
```



/cc @DouweM @grzesiek @axil


See merge request !2436

Added cache:key to .gitlab-ci.yml allowing to fine tune the caching

2016-01-20T22:12:48+00:00

Merge branch 'fix-github-pull-requests-import' into 'master'

2016-01-20T22:11:20+00:00


Fix cross projects detection when importing GitHub pull requests

Fixes #12456

See merge request !2523

Fix cross projects detection when importing GitHub pull requests

2016-01-20T21:36:35+00:00

Merge branch 'master' into issue_3945

2016-01-20T20:07:00+00:00