delta/gitlab/gitlab-ce.git/app/services, branch ci-https gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit' 2016-10-06T11:41:16+00:00 Rémy Coutable remy@rymai.me 2016-10-06T11:41:16+00:00 5bdd8c3e3e7b94dab6dfe80a279764c4d451ca75 See !6096. 
See !6096.
Merge commit 'dev/security' into 'master' 2016-10-06T06:33:11+00:00 Rémy Coutable remy@rymai.me 2016-10-06T06:33:11+00:00 d51bb99a7e7c4dce4abefbf4967aa69054066c3b Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
multi-file commit 2016-10-05T17:42:52+00:00 Marc Siegfriedt marc@techaccelerator.com 2016-08-29T23:58:32+00:00 a1ee8cf5ad07256807f15590bdb5f56152d55553 add docs and tests - add additional validation allow move without content updated response 
add docs and tests - add additional validation
allow move without content
updated response
Skip wiki creation when GitHub project has wiki enabled 2016-10-04T16:06:45+00:00 Douglas Barbosa Alexandre dbalexandre@gmail.com 2016-10-04T05:40:03+00:00 b5f954177825fbea9245149805541cffb2e0de05 If the GitHub project repository has wiki, we should not create the default wiki. Otherwise the GitHub importer will fail because the wiki repository already exist. This bug was introduced here https://gitlab.com/gitlab-org/gitlab-ce/commit/892dea67717c0efbd6a28f763 9f34535ec0a8747 
If the GitHub project repository has wiki, we should not create
the default wiki. Otherwise the GitHub importer will fail because
the wiki repository already exist.

This bug was introduced here
https://gitlab.com/gitlab-org/gitlab-ce/commit/892dea67717c0efbd6a28f763
9f34535ec0a8747
Merge branch 'cleanup-mentionable-methods-arguments' into 'master' 2016-10-04T10:51:45+00:00 Douwe Maan douwe@gitlab.com 2016-10-04T10:51:45+00:00 5042f008ede44a624517bbe0c84764d9cbda990c Simplify Mentionable concern instance methods ## What does this MR do? Simplify arguments received by the instance methods on the concern so in the closer future will be easy to understand and change ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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) ## What are the relevant issue numbers? See merge request !6596 

Simplify Mentionable concern instance methods

## What does this MR do?

Simplify arguments received by the instance methods on the concern so in the closer future will be easy to understand and change

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] 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)

## What are the relevant issue numbers?

See merge request !6596
 Merge branch 'rc-improve-members-destroy-service' into 'master' 2016-10-04T10:50:21+00:00 Robert Speicher robert@gitlab.com 2016-10-04T10:50:21+00:00 ef24c62593dd7ca8bae7fd0150f394b741f9d246 Improve `Members::DestroyService` Part of #21979. See merge request !6267 

Improve `Members::DestroyService`

Part of #21979.

See merge request !6267
 Use SELECT 1, instead SELECT COUNT(*) to ask for notes existency 2016-10-04T08:45:49+00:00 Paco Guzman pacoguzmanp@gmail.com 2016-09-30T07:26:48+00:00 a6e17cf50ecba47148307f8b05d0a73e9656a4c7 






Invert method's naming
2016-10-03T14:57:48+00:00

Rémy Coutable
remy@rymai.me

2016-09-16T11:37:21+00:00

e9d7b4f765605cfe25c2c4d8729e3d34cf5a979b

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





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







Fix a few things after the initial improvment to Members::DestroyService
2016-10-03T14:57:48+00:00

Rémy Coutable
remy@rymai.me

2016-09-09T16:51:31+00:00

c8b1311934935c7ac7fd901558e19ac496fbad2c

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





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







Improve Members::DestroyService
2016-10-03T14:57:48+00:00

Rémy Coutable
remy@rymai.me

2016-07-28T17:31:17+00:00

3158f57dba6dcef3e586ae8fced7deb6fdbd6dc0

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





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