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
4 changes: 2 additions & 2 deletions app/builders/better_together/navigation_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def build_better_together # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
)

# Add children to Better Together Navigation Item
better_together_nav_item.create_children(better_together_pages, area.reload)
better_together_nav_item.create_children(better_together_pages, area)

area.save!
area.reload.save!
end
end
# rubocop:enable Metrics/AbcSize
Expand Down
2 changes: 1 addition & 1 deletion app/future_controllers/better_together/api_controller.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'jsonapi/resource_controller'
require_dependency 'jsonapi/resource_controller'

module BetterTogether
# Base API controller
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_controller'
require_dependency 'better_together/api_controller'

module BetterTogether
module Bt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_controller'
require_dependency 'better_together/api_controller'

module BetterTogether
module Bt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_controller'
require_dependency 'better_together/api_controller'

module BetterTogether
module Bt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_controller'
require_dependency 'better_together/api_controller'

module BetterTogether
module Bt
Expand Down
3 changes: 1 addition & 2 deletions app/helpers/better_together/calendars_helper.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# frozen_string_literal: true

# require 'simple_calendar/calendar_helper'

require_dependency 'simple_calendar/calendar_helper'
Comment on lines 1 to +3

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P1] Reintroduces missing simple_calendar helper file

The helper now calls require_dependency 'simple_calendar/calendar_helper', but the simple_calendar gem does not expose a simple_calendar/calendar_helper.rb file. This explicit require was previously removed (see earlier commit message) because it raises LoadError: cannot load such file -- simple_calendar/calendar_helper when the helper is eager loaded in production. Adding the dependency again will bring that boot-time failure back. Loading the gem via require 'simple_calendar' in the engine is sufficient, so this extra require should be dropped.

Useful? React with 👍 / 👎.

module BetterTogether
module CalendarsHelper
include SimpleCalendar::CalendarHelper
Expand Down
4 changes: 2 additions & 2 deletions app/models/better_together/geography/map.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@ def to_s
end
end

require 'better_together/geography/community_map'
require 'better_together/geography/community_collection_map'
require_dependency 'better_together/geography/community_map'
require_dependency 'better_together/geography/community_collection_map'
2 changes: 1 addition & 1 deletion app/resources/better_together/api_resource.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

# require 'jsonapi/resource'
require_dependency 'jsonapi/resource'

module BetterTogether
# Base JSONAPI serializer that sets common attrbutes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_resource'
require_dependency 'better_together/api_resource'

module BetterTogether
module Bt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_resource'
require_dependency 'better_together/api_resource'

module BetterTogether
module Bt
Expand Down
2 changes: 1 addition & 1 deletion app/resources/better_together/bt/api/v1/person_resource.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_resource'
require_dependency 'better_together/api_resource'

module BetterTogether
module Bt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_resource'
require_dependency 'better_together/api_resource'

module BetterTogether
module Bt
Expand Down
2 changes: 1 addition & 1 deletion app/resources/better_together/bt/api/v1/role_resource.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_resource'
require_dependency 'better_together/api_resource'

module BetterTogether
module Bt
Expand Down
2 changes: 1 addition & 1 deletion app/resources/better_together/bt/api/v1/user_resource.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

require 'better_together/api_resource'
require_dependency 'better_together/api_resource'

module BetterTogether
module Bt
Expand Down
22 changes: 11 additions & 11 deletions lib/better_together/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ class Engine < ::Rails::Engine
end

config.before_initialize do
require 'friendly_id'
require 'mobility'
require 'friendly_id/mobility'
require 'jsonapi-resources'
require 'importmap-rails'
require 'public_activity'
require 'pundit'
require 'rack/cors'
require_dependency 'friendly_id'
require_dependency 'mobility'
require_dependency 'friendly_id/mobility'
require_dependency 'jsonapi-resources'
require_dependency 'importmap-rails'
require_dependency 'public_activity'
require_dependency 'pundit'
require_dependency 'rack/cors'
end

default_url_options = {
Expand All @@ -80,13 +80,13 @@ class Engine < ::Rails::Engine
end

initializer 'better_together.action_mailer' do |app|
if Rails.env.production?
app.config.action_mailer.show_previews = false
else
if Rails.env.development?
app.config.action_mailer.show_previews = true
app.config.action_mailer.preview_paths =
app.config.action_mailer.preview_paths.to_a +
[BetterTogether::Engine.root.join('spec/mailers/previews')]
else
app.config.action_mailer.show_previews = false
end
end

Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/initializers/rswag_ui.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# spec/dummy/config/initializers/rswag_ui.rb
# frozen_string_literal: true

require 'rswag'
require_dependency 'rswag'

Rswag::Ui.configure do |c|
# List the Swagger endpoints that you want to be documented through the swagger-ui
Expand Down
Loading