summaryrefslogtreecommitdiff
path: root/db/schema.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-04 16:12:47 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-04 16:12:47 +0000
commitac923b4fb40da88d6c7907d08d4584d5d4a560e2 (patch)
tree79050d2d630b681d1ed97448e497be87c4905328 /db/schema.rb
parentdfe12649f64bcac76b270a96be04285bbe0c2aa2 (diff)
parent5dc77d7577bf19586f6cd756678d0c2660e7f868 (diff)
downloadgitlab-ce-ac923b4fb40da88d6c7907d08d4584d5d4a560e2.tar.gz
Merge branch 'fix/atom-url-issue' into 'master'
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
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb
index d546e06cd8a..d4710346b82 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160128233227) do
+ActiveRecord::Schema.define(version: 20160129135155) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"