From 730c365594f3bd0146e93804ca95b0b970f04cd6 Mon Sep 17 00:00:00 2001 From: "W. Scott Meeks" Date: Wed, 8 Sep 2021 17:51:13 -0400 Subject: [PATCH 1/4] TTPLAT-2082 Remove extra debug lookups --- app/views/shared/_main_nav.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/shared/_main_nav.html.haml b/app/views/shared/_main_nav.html.haml index 261e305b..cff02ddd 100644 --- a/app/views/shared/_main_nav.html.haml +++ b/app/views/shared/_main_nav.html.haml @@ -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}" From bf92b83c3f1d5fc459bd973aed2dbdc9ecea3d34 Mon Sep 17 00:00:00 2001 From: "W. Scott Meeks" Date: Tue, 12 Oct 2021 11:10:44 -0400 Subject: [PATCH 2/4] Update version.rb --- lib/transam_accounting/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/transam_accounting/version.rb b/lib/transam_accounting/version.rb index 19e8f146..efd40d2b 100644 --- a/lib/transam_accounting/version.rb +++ b/lib/transam_accounting/version.rb @@ -1,3 +1,3 @@ module TransamAccounting - VERSION = "2.16.0-rc" + VERSION = "2.17.0-rc" end From 3101b991d9bbc8c5eb4b806b6fd72f94287916cc Mon Sep 17 00:00:00 2001 From: "W. Scott Meeks" Date: Fri, 12 Nov 2021 22:40:06 -0500 Subject: [PATCH 3/4] Switch to use_branch technique so that we don't have to keep updating Gemfile every branch and release --- Gemfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 57425447..18f57450 100644 --- a/Gemfile +++ b/Gemfile @@ -7,9 +7,14 @@ source "https://rubygems.org" # To use debugger # gem 'debugger' -gem 'transam_core', git: 'https://github.com/camsys/transam_core', branch: :qa -gem 'transam_reporting', git: 'https://github.com/camsys/transam_reporting', branch: :qa -gem 'transam_transit', git: 'https://github.com/camsys/transam_transit', branch: :qa +current_branch = `git rev-parse --abbrev-ref HEAD`.strip +current_branch = ENV['TRAVIS_BRANCH'] if current_branch == 'HEAD' +use_branch = ['master', 'qa', 'develop'].include?(current_branch) ? current_branch : 'develop' +puts "TransAM engines using branch: #{use_branch}" + +gem 'transam_core', git: 'https://github.com/camsys/transam_core', branch: use_branch +gem 'transam_reporting', git: 'https://github.com/camsys/transam_reporting', branch: use_branch +gem 'transam_transit', git: 'https://github.com/camsys/transam_transit', branch: use_branch gem 'mysql2', '~> 0.5.1' # lock gem for dummy app gem "capybara", '2.6.2' # lock gem for old capybara behavior on hidden element xpath From 4a42be7b439d9a59ddc790c23ff8baa79f8ca7f7 Mon Sep 17 00:00:00 2001 From: "W. Scott Meeks" Date: Fri, 12 Nov 2021 22:41:47 -0500 Subject: [PATCH 4/4] Update version.rb --- lib/transam_accounting/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/transam_accounting/version.rb b/lib/transam_accounting/version.rb index efd40d2b..9f914eeb 100644 --- a/lib/transam_accounting/version.rb +++ b/lib/transam_accounting/version.rb @@ -1,3 +1,3 @@ module TransamAccounting - VERSION = "2.17.0-rc" + VERSION = "2.17.0" end