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

Add to label :id to response

2016-05-03T16:58:43+00:00

Update CHANGELOG for 8.6.8, 8.5.12, et al.

2016-05-03T01:47:11+00:00

[ci skip]

Merge remote-tracking branch 'dev/master' into 'master'

2016-05-02T23:58:54+00:00

Merge branch 'support-notifications-on-project-snippets' into 'master'

2016-05-02T20:07:28+00:00


Support e-mail notifications for comments on project snippets

While working with project snippets recently, I noticed that notifications would not be sent out for comments on notes. This MR fixes this.

Note: I'm not completely sure why `ProjectSnippets#participants` returns an empty array if you don't include the concern that is already in `Snippets` but didn't dig into it any more.

Closes #2334

See merge request !3987

Support e-mail notifications for comments on project snippets

2016-05-02T18:01:32+00:00

Closes #2334

Merge branch '15527-fix-wiki-page-creation-issue' into 'master'

2016-05-02T17:18:22+00:00


Fix error when trying to create a wiki page

Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317.

See merge request !3924

Merge branch 'improve-session-expiry' into 'master'

2016-05-02T16:52:22+00:00


Fix "remember me" sign in option

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

Prior to this change, 'remember me' was effectively always on because
the `_gitlab_session` cookie was always made persistent. With this
change it becomes possible again to have `_gitlab_session`be a session
cookie when 'remember me' is unchecked.

See merge request !4004

Simplify specs by not over-expecting

2016-05-02T16:34:14+00:00

Signed-off-by: Rémy Coutable

Merge branch 'fix-changelog' into 'master'

2016-05-02T15:26:25+00:00


Remove duplicate entry in the CHANGELOG

[ci skip]

See merge request !4002

Fix "remember me" sign in option

2016-05-02T15:22:03+00:00