delta/gitlab/gitlab-ce.git/spec, branch api-notes-entity-fields

Merge branch 'master' into 'api-notes-entity-fields'

2017-02-22T17:32:41+00:00

# Conflicts:
#   doc/api/v3_to_v4.md

Merge branch 'connection-pool-host' into 'master'

2017-02-22T16:29:38+00:00

Allow setting of a custom connection pool host

See merge request !9445

Merge branch 'feature/brand-logo-in-emails' into 'master'

2017-02-22T16:20:46+00:00


Custom brand header logo in emails

Closes #24969 and #25570

See merge request !9049

Merge branch 'add_mr_info_to_issues_list' into 'master'

2017-02-22T16:01:10+00:00

Add merge request count to each issue on issues list

Closes #19786 and #23208

See merge request !9252

Merge branch '27032-add-a-house-keeping-api-call' into 'master'

2017-02-22T15:49:51+00:00


Add housekeeping endpoint for Projects API

Closes #27032

See merge request !9421

Merge branch 'zj-fix-slash-command-labels' into 'master'

2017-02-22T15:44:05+00:00


Chat slash commands show labels correctly

Closes #28358

See merge request !9408

Allow setting of a custom connection pool host

2017-02-22T14:47:53+00:00

This allows you to set a custom host when calling
Gitlab::Database.create_connection_pool. This is necessary for load
balancing as in this case we want to inherit all settings except for the
hostname.

Merge branch 'lnovy/gitlab-ce-empty-variables' into 'master'

2017-02-22T13:12:26+00:00

UI: Allow a project variable to be set to an empty value

See merge request !9414

Merge branch 'grapify-ci-triggers-api' into 'master'

2017-02-22T13:11:04+00:00


Grapfiy the CI::Triggers API

See merge request !9439

Merge branch '26087-asciidoc-cicd-badges-snippet' into 'master'

2017-02-22T13:03:39+00:00

Add AsciiDoc snippet for CI/CD Badges

Closes #26087

See merge request !9164