delta/gitlab/gitlab-ce.git, branch grapify-users-api

Grapify the users API

2016-11-21T09:53:28+00:00

Merge branch 'grapify-to-h' into 'master'

2016-11-14T13:15:58+00:00


Use to_h to convert params to a hash

See merge request !7406

Merge branch 'master' into 'master'

2016-11-14T12:49:03+00:00


Fix typos and grammar errors

See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html

See merge request !7451

Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master'

2016-11-14T11:59:11+00:00


Improve naming convention in ci configuration module

## What does this MR do?

This MR improves the naming convention in CI configuration module to reflect the domain design better.

## What are the relevant issue numbers?

Related to #15060

See merge request !7448

Merge branch 'grapify-subscription-api' into 'master'

2016-11-14T11:43:34+00:00


Grapify subscription API

## What are the relevant issue numbers?

Related to #22928

See merge request !7380

Fix typos and grammar

2016-11-14T11:01:52+00:00

Fix indentation in CI variables entry class

2016-11-14T10:46:41+00:00

Merge branch 'fix-help-page-links' into 'master'

2016-11-14T10:45:56+00:00


Fix error links in help index page when access it with url `http://gitlab.example.com/help/` which have an extra slash 

Fixes #24349

See merge request !7396

Merge branch 'sh-fix-sidekiq-throttling-init' into 'master'

2016-11-14T10:29:45+00:00


Only turn on Sidekiq throttling if column exists

If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column.

Closes #24452

See merge request !7446

Link to correct version of SanitizationFilter API docs for whitelist

2016-11-14T10:25:19+00:00

[ci skip]