Merge branch 'qa'

Gemfile

@@ -7,9 +7,15 @@ source "https://rubygems.org"
 
 # To use debugger
 # gem 'debugger'
-gem 'transam_core', git: 'https://github.com/camsys/transam_core', branch: :master
-gem 'transam_reporting', git: 'https://github.com/camsys/transam_reporting', branch: :master
-gem 'transam_transit', git: 'https://github.com/camsys/transam_transit', branch: :master
+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
 

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}"
 

lib/transam_accounting/version.rb

@@ -1,3 +1,3 @@
 module TransamAccounting
-  VERSION = "2.16.0"
+  VERSION = "2.17.0"
 end