Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
This commit is contained in:
@@ -59,13 +59,6 @@ describe ApplicationHelper do
|
||||
end
|
||||
end
|
||||
|
||||
describe 'favicon_path' do
|
||||
it 'returns /favicon.ico on production environment' do
|
||||
expect(Rails.env).to receive(:production?).and_return(true)
|
||||
expect(helper.favicon_path).to eq '/favicon.ico'
|
||||
end
|
||||
end
|
||||
|
||||
describe 'open_registrations?' do
|
||||
it 'returns true when open for registrations' do
|
||||
without_partial_double_verification do
|
||||
|
||||
Reference in New Issue
Block a user