summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2025-06-01 20:32:31 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2025-06-01 20:32:31 +0000
commit86f167674275a61654309cdf40a9f86e5bc4ea62 (patch)
treec1b43bfcd2c091eda383ed64bc254fca2e5ee404
parent3d8002febfb429dbb4f05c8e8dc570cb8008a7ba (diff)
downloadredmine-86f167674275a61654309cdf40a9f86e5bc4ea62.tar.gz
redmine-86f167674275a61654309cdf40a9f86e5bc4ea62.zip
Reverts r23811 (#31531).
git-svn-id: https://svn.redmine.org/redmine/trunk@23812 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--config/settings.yml2
-rw-r--r--db/migrate/017_create_settings.rb1
-rw-r--r--db/migrate/20250530185658_ensure_wiki_tablesort_setting_is_stored_in_db.rb8
-rw-r--r--test/unit/setting_test.rb4
4 files changed, 1 insertions, 14 deletions
diff --git a/config/settings.yml b/config/settings.yml
index b1217fc0a..cda40fa38 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -362,6 +362,6 @@ timelog_accept_closed_issues:
show_status_changes_in_mail_subject:
default: 1
wiki_tablesort_enabled:
- default: 0
+ default: 1
reactions_enabled:
default: 1
diff --git a/db/migrate/017_create_settings.rb b/db/migrate/017_create_settings.rb
index f86a1c2c3..5768ca24c 100644
--- a/db/migrate/017_create_settings.rb
+++ b/db/migrate/017_create_settings.rb
@@ -8,7 +8,6 @@ class CreateSettings < ActiveRecord::Migration[4.2]
# Persist default settings for new installations
Setting.create!(name: 'default_notification_option', value: Setting.default_notification_option)
Setting.create!(name: 'text_formatting', value: Setting.text_formatting)
- Setting.create!(name: 'wiki_tablesort_enabled', value: Setting.wiki_tablesort_enabled)
end
def self.down
diff --git a/db/migrate/20250530185658_ensure_wiki_tablesort_setting_is_stored_in_db.rb b/db/migrate/20250530185658_ensure_wiki_tablesort_setting_is_stored_in_db.rb
deleted file mode 100644
index b64a42dbb..000000000
--- a/db/migrate/20250530185658_ensure_wiki_tablesort_setting_is_stored_in_db.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class EnsureWikiTablesortSettingIsStoredInDb < ActiveRecord::Migration[7.2]
- def change
- unless Setting.where(name: "wiki_tablesort_enabled").exists?
- setting = Setting.new(:name => "wiki_tablesort_enabled", :value => 1)
- setting.save!
- end
- end
-end
diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb
index cbfabbb02..4ae07cebb 100644
--- a/test/unit/setting_test.rb
+++ b/test/unit/setting_test.rb
@@ -147,8 +147,4 @@ class SettingTest < ActiveSupport::TestCase
def test_default_text_formatting_for_new_installations_is_common_mark
assert_equal 'common_mark', Setting.text_formatting
end
-
- def test_default_wiki_tablesort_enabled_for_new_installations_is_disabled
- assert_equal "0", Setting.wiki_tablesort_enabled
- end
end