delta/gitlab/gitlab-ce.git/spec, branch tests-for-diff-notes

Fixed timing issue with selecting parallel or inline view types

2016-08-21T23:20:03+00:00

Replaced all `first` with `match:` equivalents

2016-08-21T08:34:32+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

Add spec for Ability.project_abilities

2016-08-20T13:53:14+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

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

Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master'

2016-08-19T20:38:44+00:00


Koding Integration

## What does this MR do?

Will provide Koding integration with GitLab services. Forked from !4914.

## Are there points in the code the reviewer needs to double check?
I've introduced new layouts which might not be necessary, first time contributor. 

## Why was this MR needed?
We're planning to ship Koding with GitLab.

## What are the relevant issue numbers?
#12759 #14698 

## Screenshots (if relevant)

### Screencasts

http://recordit.co/BDMbhwgxPD
http://recordit.co/By0qiz1ClC

### Enable Koding in Application Settings

![image](/uploads/73a69421105c03aa2b0b47e2617d3fbc/image.png)

### Koding Dashboard
![image](/uploads/6c7dda34792280c0e4791e36af4eba11/image.png)

### Set up Koding Stack
1 - ![image](/uploads/d5c2b93f8e61b5cbffdb06f0267d485f/image.png)
2 - ![image](/uploads/44d9a9b574b8ac0c5eb553fb9653d5da/image.png)

### Run on Koding on Project Page

![image](/uploads/7d2b46221009074ffff75d66d5a1a555/image.png)

### Run in IDE on Merge Requests
![image](/uploads/65eed90c34c34b5fe7ad29ef9c717640/image.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] 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 !5909