delta/gitlab/gitlab-ce.git/spec/support, branch fix/update-gitlab-git gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'issue-boards' into 'master' 2016-08-17T18:02:26+00:00 Douwe Maan douwe@gitlab.com 2016-08-17T18:02:26+00:00 46dc00631aeae34c1964888625c5ccd04da6b4c1 Issue boards ## What are the relevant issue numbers? - Issue: #17907 - Issue backend: #20335 - Backend MR: !5548 - Frontend MR: !5554 - Documentation !5713 ## Screenshots (if relevant) ## 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] ~~API support 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5548 

Issue boards

## What are the relevant issue numbers?

- Issue: #17907 
- Issue backend: #20335 
- Backend MR: !5548
- Frontend MR: !5554
- Documentation !5713 

## Screenshots (if relevant)

## 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] ~~API support 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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5548
 Fix matcher `match_response_schema` 2016-08-17T15:58:59+00:00 Douglas Barbosa Alexandre dbalexandre@gmail.com 2016-08-16T14:13:21+00:00 29a91c5bc65524fffeaaba493f30c419b98f0869 






Projects::BoardsController#show returns a list of board lists
2016-08-17T15:58:58+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-08-01T18:41:30+00:00

e1998844781b92d118f25cb8f8c0cbd293a25708












Merge remote-tracking branch 'origin/master' into mc-ui
2016-08-17T15:55:28+00:00

Sean McGivern
sean@gitlab.com

2016-08-17T15:55:28+00:00

e6f3461c0bb1cc5bb5501f1e451fff97268d87d6












Merge branch 'fix/export-att-inclusion' into 'master'

2016-08-15T19:55:02+00:00

Douwe Maan
douwe@gitlab.com

2016-08-15T19:55:02+00:00

9ef8de2fb7c0fca8014594c90bc199f11f92402d


Fix attribute inclusion import/export config ignored in some cases

In the `import_export.yml` file we define the inclusion of some of the attributes. For some reason, this isn't working in certain cases - very unfortunate this includes `user`. This has been introduced in 8.10.3.

Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20802

See merge request !1982





Fix attribute inclusion import/export config ignored in some cases

In the `import_export.yml` file we define the inclusion of some of the attributes. For some reason, this isn't working in certain cases - very unfortunate this includes `user`. This has been introduced in 8.10.3.

Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20802

See merge request !1982






Add more tests for conflicts
2016-08-12T20:24:48+00:00

Sean McGivern
sean@gitlab.com

2016-08-05T11:15:06+00:00

ce7eb4e49279ab56cac992b6743fe77cac578b48












Add backend for merge conflicts reading
2016-08-12T20:24:43+00:00

Sean McGivern
sean@gitlab.com

2016-07-25T18:47:09+00:00

df2ed097b730c8ba0b79cac8cc3dbfcb0cf587cb












Fix attribute inclusion in import/export config ignored in some cases
2016-08-11T10:49:07+00:00

James Lopez
james@jameslopez.es

2016-08-11T09:03:26+00:00

efab1677a7a2959a28a09393a2b6519072005534












New AccessRequests API endpoints for Group & Project
2016-08-10T17:07:05+00:00

Rémy Coutable
remy@rymai.me

2016-06-23T15:14:31+00:00

29850364eccccc3ce7305f6706cea1d5d073de2e

Also, mutualize AccessRequests and Members endpoints for Group &
Project.
New API documentation for the AccessRequests endpoints.

Signed-off-by: Rémy Coutable <remy@rymai.me>





Also, mutualize AccessRequests and Members endpoints for Group &
Project.
New API documentation for the AccessRequests endpoints.

Signed-off-by: Rémy Coutable <remy@rymai.me>







Enable Style/SpaceAroundEqualsInParameterDefault cop
2016-08-06T02:03:01+00:00

Gabriel Mazetto
gabriel@gitlab.com

2016-08-06T02:03:01+00:00

c9aa19881cf719baaea1bbb9bb00f84145a99b8b