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

Update gitlab-shell to v3.4.0

2016-08-20T08:57:10+00:00

Merge branch '581-ee-backport-branch-permissions' into 'master'

2016-08-20T01:36:01+00:00


Backport  changes from gitlab-org/gitlab-ee!581



See merge request !5884

Merge branch 'disable-issue-by-email' into 'master'

2016-08-20T01:29:11+00:00


Disable “issue by email” feature until it uses a different token

Separate token being worked on in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5914, but too late for 8.11.

See merge request !5915

Disable “issue by email” feature until it uses a different token

2016-08-20T00:49:12+00:00

Add element container to dropdowns

2016-08-20T00:42:10+00:00

Merge branch 'fix-diff-note-discussion-id' into 'master'

2016-08-20T00:01:49+00:00


Call `set_discussion_id` again in DiffNote `before_validation` because the order is important



See merge request !5913

Use typeof instead of Underscore method

2016-08-19T23:52:21+00:00

Call `set_discussion_id` again in DiffNote `before_validation` because the order is important

2016-08-19T23:24:12+00:00

Merge branch 'issue_18135' into 'master'

2016-08-19T23:06:30+00:00


Todos sorting dropdown

Implements #18135 

![todos_sorting](/uploads/bff76827c421628134dfb8b864e47c74/todos_sorting.png)  


- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5691

Update CHANGELOG for 8.10.7, 8.9.8, and 8.8.9

2016-08-19T21:46:51+00:00

[ci skip]