Skip to content

Commit

Permalink
Merge pull request #946 from scientist-softserv/i910-remove-ga-config…
Browse files Browse the repository at this point in the history
…-trampling

🧹 Remove trampling of Hyrax config GA
  • Loading branch information
kirkkwang authored Dec 12, 2023
2 parents 8dabf5f + 4696feb commit 7e879cb
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
3 changes: 0 additions & 3 deletions app/models/concerns/account_settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,8 @@ def set_smtp_settings
def reload_library_config
Hyrax.config do |config|
config.contact_email = contact_email
config.analytics = google_analytics_id.present?
config.google_analytics_id = google_analytics_id if google_analytics_id.present?
config.geonames_username = geonames_username
config.uploader[:maxFileSize] = file_size_limit
config.analytics_provider = analytics_provider if analytics_provider.present?
end

Devise.mailer_sender = contact_email
Expand Down
2 changes: 0 additions & 2 deletions spec/models/concerns/account_settings_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
end

context 'when is_superadmin is false' do
# rubocop:disable RSpec/ExampleLength
it 'returns all settings except private, disabled, and superadmin settings' do
expect(Account::SUPERADMIN_SETTINGS.size).to eq 7
expect(account.public_settings(is_superadmin: false).keys.sort).to eq %i[allow_downloads
Expand All @@ -57,7 +56,6 @@
ssl_configured]
expect(account.public_settings(is_superadmin: false).size).to eq 16
end
# rubocop:enable RSpec/ExampleLength
end
end
end

0 comments on commit 7e879cb

Please sign in to comment.