diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-07 00:07:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-07 00:07:14 +0300 |
| commit | b04f912deb494b6dc0d0dba36776a5e53f622b43 (patch) | |
| tree | b6af17cf69082cda35c42801a123c6e090b28c12 /lib | |
| parent | 9e5484cee690f8bb2c1796013345d8cbc1872d77 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab_settings/options.rb | 4 | ||||
| -rw-r--r-- | lib/tasks/gitlab/db.rake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab_settings/options.rb b/lib/gitlab_settings/options.rb index 5bdac74c2f6..077c1aa944a 100644 --- a/lib/gitlab_settings/options.rb +++ b/lib/gitlab_settings/options.rb @@ -43,6 +43,10 @@ module GitlabSettings end alias_method :to_h, :to_hash + def dup + self.class.build(to_hash) + end + def merge(other) self.class.build(to_hash.merge(other.deep_stringify_keys)) end diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake index d51926e0e08..c9b02304d29 100644 --- a/lib/tasks/gitlab/db.rake +++ b/lib/tasks/gitlab/db.rake @@ -497,7 +497,6 @@ namespace :gitlab do milestone = version.release.segments.first(2).join('.') classes = {} - ignored_tables = %w[p_ci_builds] Gitlab::Database.database_base_models.each do |_, model_class| tables = model_class.connection.tables @@ -520,7 +519,6 @@ namespace :gitlab do sources.each do |source_name| next if source_name.start_with?('_test_') # Ignore test tables - next if ignored_tables.include?(source_name) database = model_class.connection_db_config.name file = dictionary_file_path(source_name, views, database) |