delta/gitlab/gitlab-ce.git/db, branch remove_sqlite_check

Merge remote-tracking branch 'dev/master' into 'master'

2016-02-09T17:13:58+00:00

Merge branch 'index_snippet' into 'master'

2016-02-09T16:12:58+00:00


Add index for snippet's updated_at

@DouweM We are ordering by `updated_at` but there is no index.

cc @yorickpeterse 

See merge request !2768

Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master'

2016-02-09T14:12:56+00:00


Add option to include the sender name in body of Notify email

_Originally opened at !2495 by @huacnlee._

- - -

Fixes #7824.

See merge request !2767

Merge branch '3kami3/gitlab-ce-root_email' into 'master'

2016-02-09T13:55:52+00:00


Add an option to supply root email through an environmental variable.

_Originally opened at !2499 by @3kami3._

---

Add an option to supply root email through an environmental variable.

See merge request !2751

Add index for snippet's updated_at

2016-02-09T13:10:22+00:00

Add option to include the sender name in body of Notify email. fix #7824

2016-02-09T11:58:13+00:00

Merge branch 'fix/atom-url-issue' into 'master'

2016-02-09T10:39:20+00:00


do not rename .aToM but only .atom projects in migration

Sorry @DouweM forgot to add this.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2651/diffs#bc35672f73f4ee025132aee428f383acdf0f755e_0_51

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699

See merge request !2712

Add an option to supply root email through an environmental variable.

2016-02-08T17:26:29+00:00

Merge branch 'master' into ci-permissions

2016-02-05T19:15:32+00:00

# Conflicts:
#	db/schema.rb

remove unnecessary lower function on SQL

2016-02-04T17:38:11+00:00