delta/gitlab/gitlab-ce.git/db, branch docs/pages-admin

Merge branch 'master' into 'zj-remove-deprecated-ci-service'

2017-02-15T15:45:40+00:00

# Conflicts:
#   db/schema.rb

Merge branch 'issue_25112' into 'master'

2017-02-15T12:10:28+00:00


Disable invalid service templates

Closes #25112

See merge request !8850

Disable invalid service templates

2017-02-14T17:44:13+00:00

Remove deprecated CI service

2017-02-14T14:15:41+00:00

Use Gitlab::Database.with_connection_pool from !9192

2017-02-14T12:29:36+00:00

Disconnect the pool after done

2017-02-14T12:14:22+00:00

Use threads directly, introduce pool later:

2017-02-14T12:14:22+00:00

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8987#note_22938402

Revert "Bump schema to pass `rake db:setup`"

2017-02-14T12:14:22+00:00

This reverts commit f2ed7cbc9b36b6ad9bcc714b271e98ead756b816.

Introduce ThreadedConnectionPool for customized pool

2017-02-14T12:14:22+00:00

This way we could reuse this pool for other migrations

Feedback:

* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8987#note_22923350
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8987#note_22923365

Bump schema to pass `rake db:setup`

2017-02-14T12:14:22+00:00