delta/gitlab/gitlab-ce.git/app/controllers, branch commit-status-fix

Merge branch 'rs-emoji' into 'master'

2016-02-19T08:11:02+00:00


Update Gemojione for new hotness :sparkles:

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800

Revert "Merge branch 'saml-decoupling' into 'master' "

2016-02-18T21:14:53+00:00

This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing
changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.

Decouple SAML authentication from the default Omniauth logic

2016-02-18T18:22:19+00:00

Merge branch 'git-archive-refactor' into 'master'

2016-02-17T17:16:34+00:00


Refactor 'git archive' hand-off to gitlab-workhorse

We have a nicer way now to hand off HTTP responses to gitlab-workhorse.

Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36

See merge request !2675

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

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

Fixes #13367.

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor

2016-02-17T10:30:42+00:00

Merge branch 'rs-issue-13467' into 'master'

2016-02-16T11:40:06+00:00


Ensure Commit#show responds 404 instead of 500 when given an invalid ID

Closes #13467

See merge request !2823

Provide explicit html format when rendering git_not_found page

2016-02-15T21:38:27+00:00

Prior, if the request format was, for example, .zip, we'd get an
`ActionView::MissingTemplate` error.

Properly render the `errors/git_not_found` page

2016-02-15T20:52:39+00:00

Ensure Commit#show responds 404 instead of 500 when given an invalid ID

2016-02-15T20:48:16+00:00

Closes #13467