Skip to content

Commit

Permalink
Merge pull request #72 from puppetlabs/CAT-836-update_bootstrap_jquery
Browse files Browse the repository at this point in the history
(CAT-836) - Bump Jquery to 3.7.1 & Bootstrap 5.3.2
  • Loading branch information
GSPatton authored Oct 2, 2023
2 parents 9a580fb + 84570d5 commit 451429d
Show file tree
Hide file tree
Showing 26 changed files with 15,417 additions and 9,734 deletions.
1 change: 0 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ AllCops:
# Disabled
Style/ClassAndModuleChildren:
Enabled: false

23 changes: 22 additions & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2023-09-12 16:05:07 UTC using RuboCop version 1.56.3.
# on 2023-09-29 10:39:55 UTC using RuboCop version 1.56.4.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -197,6 +197,27 @@ RSpec/DescribeClass:
RSpec/ExampleLength:
Max: 12

# Offense count: 15
# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
# Include: **/*_spec*rb*, **/spec/**/*
RSpec/FilePath:
Exclude:
- 'spec/cache_spec.rb'
- 'spec/classes/test_multi_os.rb'
- 'spec/raw_string_spec.rb'
- 'spec/support_spec.rb'
- 'spec/unit/coverage_spec.rb'
- 'spec/unit/example/function_example_group_spec.rb'
- 'spec/unit/facter_impl_spec.rb'
- 'spec/unit/matchers/allow_value_spec.rb'
- 'spec/unit/matchers/count_generic_spec.rb'
- 'spec/unit/matchers/parameter_matcher_spec.rb'
- 'spec/unit/matchers/raise_error_spec.rb'
- 'spec/unit/matchers/run_spec.rb'
- 'spec/unit/monkey_patches/win32/taskscheduler_spec.rb'
- 'spec/unit/raw_string_spec.rb'
- 'spec/unit/sensitive_spec.rb'

# Offense count: 2
RSpec/ImplicitBlockExpectation:
Exclude:
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1072,5 +1072,4 @@ be excluded from the coverage report.
* [rspec-puppet-osmash](https://github.com/Aethylred/rspec-puppet-osmash): Provides Operation System hashes and validations for rspec-puppet
* [puppet_spec_facts](https://github.com/danieldreier/puppet_spec_facts): Gem to provide puppet fact hashes for rspec-puppet testing

For a list of other module development tools see https://voxpupuli.org/plugins/

For a list of other module development tools see [DevX Tools](https://puppetlabs.github.io/content-and-tooling-team/tools/), or from our trusted Voxpupuli community [here](https://voxpupuli.org/plugins/).
2 changes: 1 addition & 1 deletion docs/_layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ <h1 class="doc-title"><i class="icon {{ page.icon }}"></i> {{ page.title }}</h1>


<!-- Main Javascript -->
<script type="text/javascript" src="/assets/plugins/jquery-1.12.3.min.js"></script>
<script type="text/javascript" src="/assets/plugins/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="/assets/plugins/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/assets/plugins/jquery-scrollTo/jquery.scrollTo.min.js"></script>
<script type="text/javascript" src="/assets/plugins/jquery-match-height/jquery.matchHeight-min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/_layouts/cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ <h3 class="title">{{ card.title }}</h3>


<!-- Main Javascript -->
<script type="text/javascript" src="/assets/plugins/jquery-1.12.3.min.js"></script>
<script type="text/javascript" src="/assets/plugins/jquery-3.7.1.min.js"></script>
<script type="text/javascript" src="/assets/plugins/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/assets/plugins/jquery-scrollTo/jquery.scrollTo.min.js"></script>
<script type="text/javascript" src="/assets/plugins/jquery-match-height/jquery.matchHeight-min.js"></script>
Expand Down
Loading

0 comments on commit 451429d

Please sign in to comment.