delta/gitlab/gitlab-ce.git, branch zj-workhorse-format-patch

Bump workhorse version

2016-06-28T20:10:53+00:00

Workhorse to serve email diffs

2016-06-28T12:26:38+00:00

Depends on the changes in Workhorse (gitlab-org/gitlab-workhorse!48).

Merge branch 'emoji-menu-stick-search' into 'master'

2016-06-27T18:03:08+00:00


Made the search bar on emoji menu sticky

## What does this MR do?

When scrolling down the emoji menu, the search bar disappears. For better UX, the search bar no stays at the top when scrolling.

## Screenshots (if relevant)

![emoji-sticky](/uploads/a5b4773547d3d67342ddcfc07c8f1568/emoji-sticky.gif)

See merge request !4743

Merge branch 'update-omniauth-saml' into 'master'

2016-06-27T17:50:24+00:00


Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-saml

## What does this MR do?

Updates `omniauth-saml` to bring in the new `ruby-saml` dependency that addresses [CVE-2016-5697](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-5697)

Fixes #19206 

See merge request !4951

Merge branch 'mark-done-todo-id' into 'master'

2016-06-27T17:49:29+00:00


Correctly return todo ID after creating todo

See merge request !4941

Merge branch '19075-new-wiki' into 'master'

2016-06-27T17:29:03+00:00


Remove duplicate new page btn from edit wiki

## What does this MR do?
Removes duplicate button on wiki page

## What are the relevant issue numbers?
Closes #19075 

## Screenshots (if relevant)
![Screen_Shot_2016-06-24_at_9.45.28_AM](/uploads/8dca96c3e75b428d63acaaba6dede9a6/Screen_Shot_2016-06-24_at_9.45.28_AM.png)
![Screen_Shot_2016-06-24_at_9.45.57_AM](/uploads/e6ea97b07e48d2fe6f108d8c5a943583/Screen_Shot_2016-06-24_at_9.45.57_AM.png)

See merge request !4904

Merge branch 'workhorse-gmake' into 'master'

2016-06-27T17:12:29+00:00


Mention gmake

Fixes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/46

See merge request !4945

Merge branch 'new-branch-check-fix' into 'master'

2016-06-27T16:59:05+00:00


Fix check for existence of New Branch button on Issue page

## What does this MR do?

The condition in [`initCanCreateBranch`][initCanCreateBranch] mistakenly checks `$container` (the New Branch button) for falsy. However JQuery returns an empty array if no matching element was found, so this condition is never met.

## Why was this MR needed?

The wrong condition causes:
* `$.getJSON($container.data('path'))` to be called where `$container.data('path')` is `undefined`
* in this case `$.getJSON` uses `location.href`
* if the current page has a JSON representation, it is fetched and cached by browser and displayed the next time the page is visited (#17365)
* otherwise "Failed to check if new branch can be created" is displayed (#17264)

## What are the relevant issue numbers?

Fixes #17264 and #17365.

[initCanCreateBranch]: https://gitlab.com/gitlab-org/gitlab-ce/blob/v8.8.4/app/assets/javascripts/issue.js.coffee#L102


See merge request !4630

Removed duplicate Changelog entries

2016-06-27T16:58:39+00:00

Add conditional for new pag link

2016-06-27T16:52:38+00:00