delta/gitlab/gitlab-ce.git/app/models, branch patch-4

Also check if Akismet is enabled, before showing the `Submit as spam` button.

2016-08-23T02:36:04+00:00

Revert the revert of Optimistic Locking

2016-08-22T15:43:13+00:00

Fix Error 500 resulting when loading network graph

2016-08-20T16:57:20+00:00

`discussion_id` may not be present when the SELECT call for notes
does not include this attribute. Don't attempt to set the discussion ID
unless the model contains the attribute.

Closes #21119, #21128

Make Ability#project_abilities return unique values and fix counts

2016-08-20T13:53:14+00:00

Fix assorted rspec failures due to stale, cached user permissions

2016-08-20T13:53:14+00:00

RequestStore is disabled in tests, but the Ability class was
caching user permissions based on the user and project ID of
previous test runs. Revise code to use RequestStore only if it
is active.

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

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

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