delta/gitlab/gitlab-ce.git/db/migrate, 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

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

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

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

2016-02-04T16:12:47+00:00


Fix atom url issue on projects

This MR adds prevents a project to have a path ending in .atom that conflicts with the feed

and 

Adds a migration to migrate old .atom projects to a different path

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

See merge request !2651

refactored migration based on feedback

2016-02-04T14:35:03+00:00

refactored migration and spec based on feedback

2016-02-04T12:20:55+00:00