delta/gitlab/gitlab-ce.git, branch update_ci_migrate_doc

Minor ci_to_ce migration readme adjustments.

2015-09-16T13:53:44+00:00

Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' into 'master'

2015-09-16T11:57:40+00:00

Merge CI into CE

First step of #2164.

- [x] Merge latest CE master
- [x] Make application start
- [x] Re-use gitlab sessions (remove CI oauth part)
- [x] Get rid of gitlab_ci.yml config
- [x] Make tests start
- [x] Make most CI features works
- [x] Make tests green
- [x] Write migration documentation
- [x] Add CI builds to CE backup

See merge request !1204

Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

2015-09-16T11:34:58+00:00

Fix migrate task

2015-09-16T11:30:34+00:00

fix rubocop

2015-09-16T10:20:38+00:00

Added info about gitlab.yml config

2015-09-16T09:08:48+00:00

Added migration docs and updated installation documentation

2015-09-16T08:58:33+00:00

Merge branch 'fix-api-mr-sort' into 'master'

2015-09-16T07:29:29+00:00

Fix broken sort in merge request API

This MR fixes a bug in the API in querying for merge requests with a `sort_by` field would never change the ordering of the results.

Closes #2266

See merge request !1305

Merge branch 'reply-by-email-docs' into 'master'

2015-09-16T07:09:56+00:00

Expand Reply by email documentation

TODO:

- [x] Verify this works on dev server
- [ ] Figure out SSL somehow: http://www.postfix.org/TLS_README.html (Moved to #2453)

See merge request !1193

Tweak text

2015-09-16T07:09:09+00:00