Merge branch 'release/1.5'

.gitignore

@@ -3,6 +3,7 @@ capybara-*.html
 .rspec
 /log
 /node_modules
+/pkg
 /tmp
 /test/dummy/log
 /test/dummy/tmp

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abraham (1.4)
+    abraham (1.5)
       rails (~> 5.1)
 
 GEM

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
+```

lib/abraham/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abraham
-  VERSION = "1.4"
+  VERSION = "1.5"
 end

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"
   }

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"