summaryrefslogtreecommitdiff
path: root/db/schema.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-05 20:14:32 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-05 20:14:32 +0200
commit3d90560c1e6a18cf3002c6413f53ceda5c25b3d1 (patch)
treea64b78abf6c6f850b57dfea8f8fd901fa834711b /db/schema.rb
parent3eef0e18e0d4561c320b4a5d9c17d7ae7aaa3d42 (diff)
parent291e1fa93063a62e7a0f054135dc5bcebcdd0056 (diff)
downloadgitlab-ce-3d90560c1e6a18cf3002c6413f53ceda5c25b3d1.tar.gz
Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb
index 0e8d54fb267..5b114a29011 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: 20151005075649) do
+ActiveRecord::Schema.define(version: 20151005150751) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -758,6 +758,7 @@ ActiveRecord::Schema.define(version: 20151005075649) do
t.integer "dashboard", default: 0
t.integer "project_view", default: 0
t.integer "consumed_timestep"
+ t.integer "layout", default: 0
end
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree