Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorFabian Schneider <fabbbbbi+git@googlemail.com>2019-01-11 00:06:42 +0300
committerFabian Schneider <fabbbbbi+git@googlemail.com>2019-02-06 19:33:57 +0300
commit864ce6b87ad610ac0bace900bb7e9ebcc0d63983 (patch)
tree13fcf0649e07851aed7013a130e5e7452c8c45cc /db
parent8fabc92e8b4779030c4fa09d8e1c72f213814787 (diff)
Rename setting, fix wordings
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20181028120717_add_default_first_day_of_week_to_application_settings.rb16
-rw-r--r--db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb16
-rw-r--r--db/schema.rb2
3 files changed, 17 insertions, 17 deletions
diff --git a/db/migrate/20181028120717_add_default_first_day_of_week_to_application_settings.rb b/db/migrate/20181028120717_add_default_first_day_of_week_to_application_settings.rb
deleted file mode 100644
index 110a48d4d35..00000000000
--- a/db/migrate/20181028120717_add_default_first_day_of_week_to_application_settings.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-class AddDefaultFirstDayOfWeekToApplicationSettings < ActiveRecord::Migration
- include Gitlab::Database::MigrationHelpers
- disable_ddl_transaction!
-
- DOWNTIME = false
-
- def up
- add_column_with_default(:application_settings, :default_first_day_of_week, :integer, default: 0)
- end
-
- def down
- remove_column(:application_settings, :default_first_day_of_week)
- end
-end
diff --git a/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb b/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb
new file mode 100644
index 00000000000..53cfaa289f6
--- /dev/null
+++ b/db/migrate/20181028120717_add_first_day_of_week_to_application_settings.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddFirstDayOfWeekToApplicationSettings < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+ disable_ddl_transaction!
+
+ DOWNTIME = false
+
+ def up
+ add_column_with_default(:application_settings, :first_day_of_week, :integer, default: 0)
+ end
+
+ def down
+ remove_column(:application_settings, :first_day_of_week)
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index aef0f234a72..ffdc937ab52 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -168,7 +168,7 @@ ActiveRecord::Schema.define(version: 20190131122559) do
t.string "commit_email_hostname"
t.boolean "protected_ci_variables", default: false, null: false
t.string "runners_registration_token_encrypted"
- t.integer "default_first_day_of_week", default: 0, null: false
+ t.integer "first_day_of_week", default: 0, null: false
t.index ["usage_stats_set_by_user_id"], name: "index_application_settings_on_usage_stats_set_by_user_id", using: :btree
end