delta/gitlab/gitlab-ce.git/lib, branch 22964-git-commit-documentation-article

Merge branch 'rc-improve-members-destroy-service' into 'master'

2016-10-04T10:50:21+00:00


Improve `Members::DestroyService`

Part of #21979.

See merge request !6267

GrapeDSL for Namespace endpoint

2016-10-04T05:47:29+00:00

Remove useless code now that Member#add_user handles it

2016-10-03T16:43:33+00:00

Signed-off-by: Rémy Coutable

Fix a few things after the initial improvment to Members::DestroyService

2016-10-03T14:57:48+00:00

Signed-off-by: Rémy Coutable

Improve Members::DestroyService

2016-10-03T14:57:48+00:00

Signed-off-by: Rémy Coutable

Merge branch 'aiionx_sidekiq_log_patch' into 'master'

2016-10-03T14:20:18+00:00


Log sidekiq arguments as json

Logging the sidekiq job arguments as a ruby literal structure 
is akward. Specially when parsing the logs.

JSON is a standar format.



See merge request !3735

Merge branch '22466-task-list-fork' into 'master'

2016-10-03T14:18:02+00:00


Resolve "Task List Checkbox Alignment"

## What does this MR do?

Replace the unmaintained `task_list` gem with the `deckar01-task_list` fork

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

 - I had to pin some dependencies in the fork to support `ruby < 2.2`, which added new version restrictions for 2 existing modules.
 - I triggered a build after I removed the patch to show the test passed with the new gem, then I removed the test, because this behavior is tested in the gem's repo now.

## Why was this MR needed?

 - The `task_list` patch was added with a comment that said it should be removed when merged upstream, but the repo got archived, so an upstream patch requires a fork.
 - #22470 can't be patched without warnings due to the way `task_list` uses Ruby constants.
 - There are additional outstanding `task_list` bugs that can be fixed once we switch to a fork.

## What are the relevant issue numbers?

 - #22466 
 - #22470
 - !6487

See merge request !6625

Merge branch 'zj-grape-award-emoji' into 'master'

2016-10-03T12:13:39+00:00


GrapeDSL for Award Emoji endpoints

Cherry-picked from !6330

See merge request !6629

Merge branch 'zj-grape-keys' into 'master'

2016-10-03T10:57:52+00:00


GrapeDSL for Keys endpoint

No changelog item as it doesn't change behaviour
Cherry-picket from !6330

See merge request !6631

GrapeDSL for Award Emoji endpoints

2016-10-03T08:32:09+00:00