Merge pull request #410 from betadots/updates

Updates permissions for dependabot automerge, ordering of gemfile and simplify gemfile.lock platforms

.github/workflows/ci.yaml

@@ -76,6 +76,8 @@ jobs:
       - run: echo Test suite completed
 
   dependabot:
+    permissions:
+      contents: write
     name: 'Dependabot auto-merge'
     needs:
       - tests

Gemfile

@@ -25,6 +25,7 @@ gem 'bcrypt', '~> 3.1.20'
 
 gem 'breadcrumbs_on_rails'
 gem 'cancancan'
+gem 'deep_merge', require: "deep_merge/core"
 gem 'diffy'
 gem 'faker'
 gem 'friendly_id', '~> 5.5.1'
@@ -33,7 +34,6 @@ gem 'net-ldap', require: "net/ldap"
 gem 'puppet'
 gem 'puppetdb-ruby', require: 'puppetdb'
 gem 'ruby-saml'
-gem 'deep_merge', require: "deep_merge/core"
 
 # To use retry middleware with Faraday v2.0+
 gem 'faraday-retry'

Gemfile.lock

@@ -482,9 +482,9 @@ GEM
     zeitwerk (2.6.14)
 
 PLATFORMS
-  arm64-darwin-22
+  arm64-darwin
   ruby
-  x86_64-darwin-22
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
@@ -532,7 +532,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 RUBY VERSION
-   ruby 3.3.3p89
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.5.3