Merge tag '2.6' into develop

lotfe-obaid · lotfe-obaid · commit 94ac74661a3e · 2023-04-10T00:06:34.000+03:00
2.6
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.5.3
+2.6
diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,7 @@ end
 rails_version = ENV['RAILS_VERSION'] || 'default'
 rails = case rails_version
         when 'default'
-          '~> 5.2'
+          '~> 6.1.6'
         when 'master'
           {github: 'rails/rails'}
         else
diff --git a/app/assets/javascripts/abraham/index.js b/app/assets/javascripts/abraham/index.js
@@ -1,4 +1,4 @@
-//= require js-cookie/src/js.cookie
+//= require js-cookie/dist/js.cookie
 //= require shepherd.js/dist/js/shepherd
 
 var Abraham = new Object();
diff --git a/lib/abraham/version.rb b/lib/abraham/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abraham
-  VERSION = "2.5.1"
+  VERSION = "2.6"
 end
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "abraham",
   "private": true,
   "dependencies": {
-    "js-cookie": "^2.2.0",
-    "shepherd.js": "^6.0.0-beta"
+    "js-cookie": "^3.0.1",
+    "shepherd.js": "^10"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//= require js-cookie/src/js.cookie`
	`1`	`+//= require js-cookie/dist/js.cookie`
`2`	`2`	`//= require shepherd.js/dist/js/shepherd`
`3`	`3`
`4`	`4`	`var Abraham = new Object();`