Skip to content

Commit

Permalink
Merge branch 'develop' into qa
Browse files Browse the repository at this point in the history
  • Loading branch information
smeeks committed Oct 12, 2021
2 parents d2858b8 + bf92b83 commit 38fc4be
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions app/views/shared/_main_nav.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
-# render the engine main nav components if there are any
- SystemConfig.transam_module_names.each do |mod|
- view_component = "#{mod}_main_nav"
- Rails.logger.debug "Checking for #{view_component}: Results = #{lookup_context.template_exists?(view_component, 'shared', true)}"
- if lookup_context.template_exists?(view_component, 'shared', true)
= render :partial => "shared/#{view_component}"

-# render the application main nav components if there are any
- view_component = "app_main_nav"
- Rails.logger.debug "Checking for #{view_component}: Results = #{lookup_context.template_exists?(view_component, 'shared', true)}"
- if lookup_context.template_exists?(view_component, 'shared', true)
= render :partial => "shared/#{view_component}"

Expand Down
2 changes: 1 addition & 1 deletion lib/transam_accounting/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module TransamAccounting
VERSION = "2.16.0"
VERSION = "2.17.0-rc"
end

0 comments on commit 38fc4be

Please sign in to comment.