delta/gitlab/gitlab-ce.git, branch backport_changes_from_ee

Backport select_helper from EE

2016-04-20T12:07:06+00:00

Merge branch 'pmq20/gitlab-ce-issue_12785'

2016-04-19T16:25:42+00:00

Merge branch 'mr-formatting' into 'master'

2016-04-19T16:23:41+00:00


use ! rather than # for merge request references

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278

See merge request !3740

Merge branch '14566-confidential-issue-branches' into 'master'

2016-04-19T16:15:50+00:00


Sanitize branch names for confidential issues

- When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`.
- The behaviour for non-confidential issues stays the same.

Closes #14566

See merge request !3671

Merge branch 'toggle-points-per-packet' into 'master'

2016-04-19T15:49:00+00:00


Configuring of points per UDP packet

Related to https://gitlab.com/gitlab-com/operations/issues/195. This option would allow us to experiment with finding a good balance between points-per-packet and the UDP packet size.

cc @pcarranza 

See merge request !3816

Merge branch 'bump-version' into 'master'

2016-04-19T15:42:06+00:00


Bump version to 8.8.0-pre

See merge request !3809

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2016-04-19T15:39:15+00:00

Merge branch 'patch-1' into 'master'

2016-04-19T15:35:33+00:00


"git lfs init" is deprecated, use "git lfs install" instead.

Recent releases of git-lfs warn that "init" is a deprecated command and that "install" should be used.


See merge request !3779

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

2016-04-19T15:16:00+00:00


Remove persistent XSS vulnerability in `commit_person_link` helper

Because we were incorrectly supplying the tooltip title as
`data-original-title` (which Bootstrap's Tooltip JS automatically
applies based on the `title` attribute; we should never be setting it
directly), the value was being passed through as-is.

Instead, we should be supplying the normal `title` attribute and letting
Rails escape the value, which also negates the need for us to call
`sanitize` on it.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126

See merge request !1948

Merge branch 'profile-aside-toggle' into 'master'

2016-04-19T14:05:28+00:00


Removed aside toggle on profile pages

Closes #13943

See merge request !3796