Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## Unreleased
### Modified
- migrate primary and foreign keys from ID to UUID
- 500 error page

### Fixed
- pagy overflow bug
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ def not_found = page_not_found
private

def page_not_found
render template: 'web/shared/404', status: :not_found, formats: [:html]
render template: 'web/errors/not_found', status: :not_found, formats: [:html]
end

def access_denied
render template: 'web/shared/access', status: :forbidden, formats: [:html]
render template: 'web/errors/forbidden', status: :forbidden, formats: [:html]
end
end
9 changes: 9 additions & 0 deletions app/controllers/web/errors_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true

module Web
class ErrorsController < ApplicationController
skip_before_action :authenticate

def internal; end
end
end
8 changes: 8 additions & 0 deletions app/views/controllers/web/errors/internal.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<%= render PageWrappers::UserComponent.new(current_user: current_user) do %>
<div class="h-full flex flex-1 justify-center items-center">
<div>
<p class="text-2xl text-center uppercase">Internal error occured</p>
<p class="text-center">We will check debug info and fix the problem</p>
</div>
</div>
<% end %>
2 changes: 2 additions & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 7.1

config.exceptions_app = routes

config.middleware.use Rack::Deflater
# Rack::Brotli goes directly under Rack::Deflater, if Rack::Deflater is present
config.middleware.use Rack::Brotli
Expand Down
2 changes: 2 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,7 @@
get 'access_tokens', to: 'welcome#access_tokens'
end

get '/500', to: 'web/errors#internal'

root 'web/welcome#index'
end
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
it 'renders 404 page' do
do_request

expect(response).to render_template 'shared/404'
expect(response).to render_template 'errors/not_found'
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/admin/repositories_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def do_request
context 'for unexisting repository' do
it 'does not destroy repository', :aggregate_failures do
expect { do_request }.not_to change(Repository, :count)
expect(response).to render_template 'shared/404'
expect(response).to render_template 'errors/not_found'
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
it 'renders 404 page' do
do_request

expect(response).to render_template 'shared/404'
expect(response).to render_template 'errors/not_found'
end
end

context 'for not existing user company' do
it 'renders access page' do
get :edit, params: { company_id: company.id, locale: 'en' }

expect(response).to render_template 'shared/access'
expect(response).to render_template 'errors/forbidden'
end
end

Expand All @@ -42,7 +42,7 @@
it 'renders access page' do
get :edit, params: { company_id: company.id, locale: 'en' }

expect(response).to render_template 'shared/access'
expect(response).to render_template 'errors/forbidden'
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
it 'renders access denied' do
do_request

expect(response).to render_template 'shared/404'
expect(response).to render_template 'errors/not_found'
end
end

Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/web/companies_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ def do_request
it 'renders 404 page' do
do_request

expect(response).to render_template 'shared/404'
expect(response).to render_template 'errors/not_found'
end
end

context 'for not existing user company' do
it 'renders 404 page' do
delete :destroy, params: { id: company.id, locale: 'en' }

expect(response).to render_template 'shared/404'
expect(response).to render_template 'errors/not_found'
end
end

Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/web/repositories_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ def do_request
it 'renders 404 page' do
do_request

expect(response).to render_template 'shared/404'
expect(response).to render_template 'errors/not_found'
end
end

context 'for not existing user company' do
it 'renders 404 page' do
delete :destroy, params: { id: repository.id, locale: 'en' }

expect(response).to render_template 'shared/404'
expect(response).to render_template 'errors/not_found'
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/support/shared/required_admin_auth.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
it 'render shared error' do
do_request

expect(response).to render_template 'web/shared/access'
expect(response).to render_template 'web/errors/forbidden'
end
end
end