diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-14 15:18:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-14 15:18:46 +0000 |
| commit | 4bdfb0391a578847fde5589eb44ac6737c9e4b64 (patch) | |
| tree | 4af12a6ef4f7ead85c2d80a48687f42c492564fa /db/schema.rb | |
| parent | 161d7c02d4ff49d6d91b982faee61b5de00d2631 (diff) | |
| parent | b70b962892b2428557d95a9639fbcead4fe546fd (diff) | |
| download | gitlab-ce-4bdfb0391a578847fde5589eb44ac6737c9e4b64.tar.gz | |
Merge branch 'master' into 'dz-remove-namespaces-path-uniq'
Merge Request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8013
# Conflicts:
# db/schema.rb
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 08b1590e484..4711b7873af 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: 20161206153754) do +ActiveRecord::Schema.define(version: 20161212142807) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1290,4 +1290,4 @@ ActiveRecord::Schema.define(version: 20161206153754) do add_foreign_key "subscriptions", "projects", 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 |