diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-26 22:46:29 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-27 13:27:59 +0200 |
| commit | a77e3e0afe97458da9c36d6b6ded8b8b2a6c7ce2 (patch) | |
| tree | d6c5468def5d4e7c94ccf2df293277740af7267b | |
| parent | 2dfa7072df4d9095d71f01f3607ca366225a057e (diff) | |
| download | gitlab-ce-a77e3e0afe97458da9c36d6b6ded8b8b2a6c7ce2.tar.gz | |
Merge branch 'fix-missing-schema-update' into 'master'
Fix missing schema update for 20160722221922
20160722221922 was merged in 8.10.1 but the schema.rb was not updated.
See merge request !5512
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9790c5accc5..7dbcac9175a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,7 @@ v 8.10.2 (unreleased) - Fix expand all diffs button in compare view. !5500 - Show release notes in tags list. !5503 - Fix a bug where forking a project from a repository storage to another would fail. !5509 + - Fix missing schema update for `20160722221922`. !5512 v 8.10.1 - Refactor repository storages documentation. !5428 diff --git a/db/schema.rb b/db/schema.rb index b87f8108bb2..15cee55a7bf 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: 20160721081015) do +ActiveRecord::Schema.define(version: 20160722221922) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |