delta/gitlab/gitlab-ce.git/app, branch example-java

Merge branch 'bugfix/jschatz1/milestone-icon' into 'master'

2016-02-17T16:21:08+00:00


Correct icon for milestones.



See merge request !2856

Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' into 'master'

2016-02-17T15:57:34+00:00


Sort line notes used in parallel diff by created_at


Fixes #13464.

See merge request !2858

Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master'

2016-02-17T15:52:35+00:00


Redirect /import to project page if no importing at all and repo exists


Fixes gitlab-org/gitlab-ce#13367.

See merge request !2857

Sort line notes used in parallel diff by created_at

2016-02-17T15:31:14+00:00

Fixes #13464.

Merge branch 'expire-fork-import-caches' into 'master'

2016-02-17T14:07:54+00:00


Expire caches after forking/importing a repository

cc @dblessing @DouweM 

Related issue: gitlab-org/gitlab-ce#13505

See merge request !2838

Merge branch 'image-diff' into 'master'

2016-02-17T14:06:10+00:00


Fixes for showing images

- Render scrubbed SVG's inline, not via /raw/
- Use /raw/ requests on image diffs

Both of these are needed because of no longer eager loading blobs.

This a follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2830

Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/13350

See merge request !2837

Redirect /import to project page if no importing at all and repo exists

2016-02-17T14:05:44+00:00

Fixes #13367.

Correct icon for milestones.

2016-02-17T14:02:34+00:00

Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' into 'master'

2016-02-17T14:01:30+00:00


Fix a bug preventing from doing subsequent edits in any Issuable sidebar

Fixes #13517. Fixes #12572.

### Issue

![impossible-subsequent-issue-edits-in-sidebar](/uploads/bd45c0effb46848641932d9cd38d3fe2/impossible-subsequent-issue-edits-in-sidebar.gif)

---

### Merge request

![impossible-subsequent-mr-edits-in-sidebar](/uploads/b4e1e3e93df4ac0a3d962df8b6139de9/impossible-subsequent-mr-edits-in-sidebar.gif)

/cc @jschatz1 @sytses 

See merge request !2848

Merge branch 'klowner/gitlab-ce-fix-compare-by-tag-crash' into 'master'

2016-02-17T14:00:58+00:00


Fix 500 error when comparing by tags

_Originally opened at !2787 by @klowner._

- - -

Fixes #13171.
Fixes #13370.

See merge request !2849