Skip to content

Commit 451429d

Browse files
authored
Merge pull request #72 from puppetlabs/CAT-836-update_bootstrap_jquery
(CAT-836) - Bump Jquery to 3.7.1 & Bootstrap 5.3.2
2 parents 9a580fb + 84570d5 commit 451429d

26 files changed

+15417
-9734
lines changed

.rubocop.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ AllCops:
1717
# Disabled
1818
Style/ClassAndModuleChildren:
1919
Enabled: false
20-

.rubocop_todo.yml

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

200+
# Offense count: 15
201+
# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
202+
# Include: **/*_spec*rb*, **/spec/**/*
203+
RSpec/FilePath:
204+
Exclude:
205+
- 'spec/cache_spec.rb'
206+
- 'spec/classes/test_multi_os.rb'
207+
- 'spec/raw_string_spec.rb'
208+
- 'spec/support_spec.rb'
209+
- 'spec/unit/coverage_spec.rb'
210+
- 'spec/unit/example/function_example_group_spec.rb'
211+
- 'spec/unit/facter_impl_spec.rb'
212+
- 'spec/unit/matchers/allow_value_spec.rb'
213+
- 'spec/unit/matchers/count_generic_spec.rb'
214+
- 'spec/unit/matchers/parameter_matcher_spec.rb'
215+
- 'spec/unit/matchers/raise_error_spec.rb'
216+
- 'spec/unit/matchers/run_spec.rb'
217+
- 'spec/unit/monkey_patches/win32/taskscheduler_spec.rb'
218+
- 'spec/unit/raw_string_spec.rb'
219+
- 'spec/unit/sensitive_spec.rb'
220+
200221
# Offense count: 2
201222
RSpec/ImplicitBlockExpectation:
202223
Exclude:

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,5 +1072,4 @@ be excluded from the coverage report.
10721072
* [rspec-puppet-osmash](https://github.com/Aethylred/rspec-puppet-osmash): Provides Operation System hashes and validations for rspec-puppet
10731073
* [puppet_spec_facts](https://github.com/danieldreier/puppet_spec_facts): Gem to provide puppet fact hashes for rspec-puppet testing
10741074

1075-
For a list of other module development tools see https://voxpupuli.org/plugins/
1076-
1075+
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/).

docs/_layouts/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ <h1 class="doc-title"><i class="icon {{ page.icon }}"></i> {{ page.title }}</h1>
8282

8383

8484
<!-- Main Javascript -->
85-
<script type="text/javascript" src="/assets/plugins/jquery-1.12.3.min.js"></script>
85+
<script type="text/javascript" src="/assets/plugins/jquery-3.7.1.min.js"></script>
8686
<script type="text/javascript" src="/assets/plugins/bootstrap/js/bootstrap.min.js"></script>
8787
<script type="text/javascript" src="/assets/plugins/jquery-scrollTo/jquery.scrollTo.min.js"></script>
8888
<script type="text/javascript" src="/assets/plugins/jquery-match-height/jquery.matchHeight-min.js"></script>

docs/_layouts/cards.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ <h3 class="title">{{ card.title }}</h3>
9090

9191

9292
<!-- Main Javascript -->
93-
<script type="text/javascript" src="/assets/plugins/jquery-1.12.3.min.js"></script>
93+
<script type="text/javascript" src="/assets/plugins/jquery-3.7.1.min.js"></script>
9494
<script type="text/javascript" src="/assets/plugins/bootstrap/js/bootstrap.min.js"></script>
9595
<script type="text/javascript" src="/assets/plugins/jquery-scrollTo/jquery.scrollTo.min.js"></script>
9696
<script type="text/javascript" src="/assets/plugins/jquery-match-height/jquery.matchHeight-min.js"></script>

0 commit comments

Comments
 (0)