diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-05 21:14:32 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-05 21:14:32 +0300 |
| commit | 3d90560c1e6a18cf3002c6413f53ceda5c25b3d1 (patch) | |
| tree | a64b78abf6c6f850b57dfea8f8fd901fa834711b /db | |
| parent | 3eef0e18e0d4561c320b4a5d9c17d7ae7aaa3d42 (diff) | |
| parent | 291e1fa93063a62e7a0f054135dc5bcebcdd0056 (diff) | |
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')
| -rw-r--r-- | db/migrate/20151005150751_add_layout_option_for_users.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/db/migrate/20151005150751_add_layout_option_for_users.rb b/db/migrate/20151005150751_add_layout_option_for_users.rb new file mode 100644 index 00000000000..ead9b1f8977 --- /dev/null +++ b/db/migrate/20151005150751_add_layout_option_for_users.rb @@ -0,0 +1,5 @@ +class AddLayoutOptionForUsers < ActiveRecord::Migration + def change + add_column :users, :layout, :integer, default: 0 + end +end
\ No newline at end of file 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 |