From c3ba307eba18c798681fc7c586972284c49befff Mon Sep 17 00:00:00 2001
From: Jonathan Abbett <jonathan@act.md>
Date: Tue, 26 Mar 2019 20:01:29 -0400
Subject: [PATCH 1/2] Update: Testing, releasing instructions on README

---
 .gitignore |  1 +
 README.md  | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/.gitignore b/.gitignore
index b451ca2..4cb5578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ capybara-*.html
 .rspec
 /log
 /node_modules
+/pkg
 /tmp
 /test/dummy/log
 /test/dummy/tmp
diff --git a/README.md b/README.md
index 6159bd3..3c3139d 100644
--- a/README.md
+++ b/README.md
@@ -133,3 +133,49 @@ Rails.application.configure do
   config.abraham.tours = {}
 end
 ```
+
+## Contributing
+
+Contributions are welcome!
+
+Create a feature branch (using git-flow) and submit as a pull request.
+
+Everyone interacting in Abraham's codebase, issue tracker, etc. is expected to follow the [Contributor Covenent Code of Conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct).
+
+### Testing
+
+This Rails engine contains a test app called `dummy` with controller and system tests. They'll all get run with `rails t`.
+
+Final testing should be done in a standalone Rails app, following the README instructions.
+
+To install the `abraham` gem with a local path:
+
+```
+gem 'abraham', path: '~/Workspace/abraham'
+```
+
+### Releasing
+
+Create a git-flow release:
+
+```
+$ git flow release start VERSION_NUMBER
+```
+
+Edit `lib/abraham/version.rb` and increase the version number.
+
+Build the gem and push to Rubygems:
+
+```
+$ rake build
+$ gem push pkg/abraham-VERSION_NUMBER.gem 
+```
+
+Finish the git-flow release and push to GitHub:
+
+```
+$ git flow release finish
+$ git push origin develop
+$ git push origin master
+$ git push --tags
+```
\ No newline at end of file

From 831cfe373455994123c24cde895fd951f4cfcb8f Mon Sep 17 00:00:00 2001
From: Jonathan Abbett <jonathan@act.md>
Date: Tue, 14 May 2019 16:31:05 -0400
Subject: [PATCH 2/2] Update: Upgrade jQuery to address CVE-2019-11358

---
 Gemfile.lock           | 2 +-
 lib/abraham/version.rb | 2 +-
 package.json           | 2 +-
 yarn.lock              | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index eedc33c..6cbd824 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abraham (1.4)
+    abraham (1.5)
       rails (~> 5.1)
 
 GEM
diff --git a/lib/abraham/version.rb b/lib/abraham/version.rb
index 47ab81b..89048a3 100644
--- a/lib/abraham/version.rb
+++ b/lib/abraham/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abraham
-  VERSION = "1.4"
+  VERSION = "1.5"
 end
diff --git a/package.json b/package.json
index 4dab5d2..4919331 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "abraham",
   "private": true,
   "dependencies": {
-    "jquery": "^3.3.1",
+    "jquery": "^3.4.0",
     "js-cookie": "^2.2.0",
     "shepherd.js": "^2.5.0"
   }
diff --git a/yarn.lock b/yarn.lock
index f1e176e..e39d609 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,10 +7,10 @@ element-matches@^0.1.2:
   resolved "https://registry.yarnpkg.com/element-matches/-/element-matches-0.1.2.tgz#7345cb71e965bd2b12f725e524591c102198361a"
   integrity sha512-yWh1otcs3OKUWDvu/IxyI36ZI3WNaRZlI0uG/DK6fu0pap0VYZ0J5pEGTk1zakme+hT0OKHwhlHc0N5TJhY6yQ==
 
-jquery@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
-  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
+jquery@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
+  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
 
 js-cookie@^2.2.0:
   version "2.2.0"