Merge remote-tracking branch 'upstream/7.x' into merge_7x_main_mar

* upstream/7.x:
  (maint) fix rubocop SpaceBeforeFirstArg offenses
  (PUP-11770) Eliminate duplicate methods reported by rubocop
  (PUP-11764) DRY module integration tests
  (PUP-11764) Remove unnecessary test
  (PUP-11764) Convert unmodified_module
  (PUP-11764) Convert module_with_removed_file
  (PUP-11764) Convert module_with_modified_file
  (PUP-11764) Convert missing_metadata_json
  (PUP-11764) Convert missing_checksums_json
  (PUP-11764) Convert invalid_module_install_path
  (PUP-11764) Convert with_environment to integration test
  (PUP-11764) Add nginx module fixture
  (maint) Pin RuboCop gem
  (packaging) Updating manpage file for 7.x
  (maint) Update check Ruby from 2.5 to 2.7
  (PUP-11376) Updates RuboCop

Author: joshcooper

.gitattributes

@@ -0,0 +1,6 @@
+# Disable NL -> CRNL translation on Windows. This is necessary because the files on disk must
+# match the checksums in metadata.json.
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/README -text
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/metadata.json -text
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/Modulefile -text
+spec/fixtures/integration/application/module/environments/direnv/modules/nginx/manifests/init.pp -text

.github/workflows/checks.yaml

@@ -16,9 +16,9 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {check: rubocop, os: ubuntu-latest, ruby: 2.7}
-          - {check: commits, os: ubuntu-latest, ruby: 2.7}
-          - {check: warnings, os: ubuntu-latest, ruby: 2.7}
+          - {check: rubocop, os: ubuntu-latest, ruby: '2.7'}
+          - {check: commits, os: ubuntu-latest, ruby: '2.7'}
+          - {check: warnings, os: ubuntu-latest, ruby: '2.7'}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:

.github/workflows/mend.yaml

@@ -3,7 +3,7 @@ name: Mend Monitor
 on:
   push:
     branches:
-      - 7.x
+      - main
 jobs:
   mend_monitor:
     if: ${{ github.repository_owner == 'puppetlabs' }}