diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-02-16 13:10:32 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-02-16 13:10:32 +1100 |
| commit | 8a928af0fc54a84c5b858955e7459512155d4af0 (patch) | |
| tree | 4c55ff6c1cd20405e9adf5973e2ce1c229fcebde /db/schema.rb | |
| parent | 3f713db0da2602152aa482b57f84b7418fd20a93 (diff) | |
| parent | b05e75b8faccc50749adc63419074c91802a8f50 (diff) | |
| download | gitlab-ce-task_list_refactor.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactor
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index d421d5c6774..52672406ec6 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: 20170210075922) do +ActiveRecord::Schema.define(version: 20170214111112) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1351,4 +1351,4 @@ ActiveRecord::Schema.define(version: 20170210075922) do add_foreign_key "timelogs", "merge_requests", name: "fk_timelogs_merge_requests_merge_request_id", on_delete: :cascade add_foreign_key "trending_projects", "projects", on_delete: :cascade add_foreign_key "u2f_registrations", "users" -end +end
\ No newline at end of file |