From 3ad6653b3e64ad81278cbbc24dacd15bd2d32e6f Mon Sep 17 00:00:00 2001 From: Ezekiel Kigbo Date: Tue, 7 May 2019 21:58:16 +0000 Subject: Added user time settings fields to profile Udpated user_edit_profile_spec with time preferences Minor update form fields --- ...0190325105715_add_fields_to_user_preferences.rb | 24 ++++++++++++++++++++++ db/schema.rb | 3 +++ 2 files changed, 27 insertions(+) create mode 100644 db/migrate/20190325105715_add_fields_to_user_preferences.rb (limited to 'db') diff --git a/db/migrate/20190325105715_add_fields_to_user_preferences.rb b/db/migrate/20190325105715_add_fields_to_user_preferences.rb new file mode 100644 index 00000000000..9ea3b4f9cd8 --- /dev/null +++ b/db/migrate/20190325105715_add_fields_to_user_preferences.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddFieldsToUserPreferences < ActiveRecord::Migration[5.0] + include Gitlab::Database::MigrationHelpers + + disable_ddl_transaction! + + DOWNTIME = false + + def up + add_column(:user_preferences, :timezone, :string) + add_column(:user_preferences, :time_display_relative, :boolean) + add_column(:user_preferences, :time_format_in_24h, :boolean) + end + + def down + remove_column(:user_preferences, :timezone) + remove_column(:user_preferences, :time_display_relative) + remove_column(:user_preferences, :time_format_in_24h) + end +end diff --git a/db/schema.rb b/db/schema.rb index deaf406fe3d..1be3afd5282 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2246,6 +2246,9 @@ ActiveRecord::Schema.define(version: 20190506135400) do t.integer "first_day_of_week" t.string "issues_sort" t.string "merge_requests_sort" + t.string "timezone" + t.boolean "time_display_relative" + t.boolean "time_format_in_24h" t.index ["user_id"], name: "index_user_preferences_on_user_id", unique: true, using: :btree end -- cgit v1.2.3