Merge branch 'staging' into dependabot/bundler/webmock-3.0.1

.github/ISSUE_TEMPLATE.md

@@ -1,11 +1,11 @@
 > Please provide a general summary of the issue in the Issue Title above
-> fill out the headings below as applicable to the issue you are reporting, 
+> fill out the headings below as applicable to the issue you are reporting,
 > deleting as appropriate but offering us as much detail as you can to help us resolve the issue
 
 ### Expected Behaviour
 > What should happen?
 
-### Desired Behaviour (for enhancement suggestions only)
+### Desired Behaviour (for improvement suggestions only)
 > if relevant include images or hyperlinks to other resources that clarify the enhancement you're seeking
 
 ### Current Behaviour (for problems)
@@ -21,4 +21,4 @@
 ### Your Environment
 > Include as many relevant details about the environment you experienced the bug in - this will help us resolve the bug more expediently
 * Environment name and version (e.g. Chrome 39, node.js 5.4):
-* Operating System and version (desktop or mobile):
+* Operating System and version (desktop or mobile):

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,10 @@
+This PR fixes #
+
+Changes proposed in this pull request:
+
+-
+-
+-
+
+> the below tags the current administrator for this repository
+@quadrophobiac

.ruby-version

@@ -1 +1 @@
-2.1.8
+2.1.10

.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+rvm:
+  - 2.1.10
 services:
   - redis
 bundler_args: --without development

CODE_OF_CONDUCT.md

@@ -0,0 +1,74 @@
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+### Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [labs@theodi.org](mailto:labs@theodi.org). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -0,0 +1,32 @@
+# Contributing to Open Data Certificates
+
+Open Data Certificates is open source, and contributions are gratefully accepted!
+Details on how to contribute are below. By participating in this project, you agree to abide by our [Code of Conduct](https://github.com/theodi/open-data-certificate/blob/CODE_OF_CONDUCT.md).
+
+Before you start coding on an issue, please reach out to us either on our [gitter channel](https://gitter.im/theodi/toolbox) or leave a comment on the issue ticket you are interested in contributing towards to indicate your interest in helping.
+
+If this is your first time contributing to the ODI’s codebase you will need to [create a fork of this repository](https://help.github.com/articles/fork-a-repo/).
+
+Consult our [Getting Started Guide](https://github.com/theodi/toolbox/wiki/Developers-Guide:-Getting-Started) (if necessary) and then follow the [readme instructions](https://github.com/theodi/open-data-certificate/blob/master/README.md#development) to get your Development environment running locally
+
+Ensure that the [tests](https://github.com/theodi/open-data-certificate/blob/master/README.md#tests) pass before working on your contribution
+
+## Code Review Process
+
+All contributions to the codebase - whether fork or pull request - will be reviewed per the below criteria.
+To increase your chances of your push being accepted please be aware of the following
+- Write [well formed commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+- Follow our [style guide recommendations](https://github.com/theodi/toolbox/blob/master/README.md#code-style-guide)
+- Write tests for all changes (additions or refactors of existing code).
+- Of the github integrations we use two will be utilised to check appraise your contribution. In order of priority these are
+    - Travis ensures that all tests (existing and additions) pass
+    - Travis/Coveralls ensures that overall test coverage for lines of code meets a certain threshold. If this metric dips below what it previously was for the repository you’re pushing to then your PR will be rejected
+    - Gemnasium ensures dependencies are up to date
+- Once your PR is published and passes the above checks a repository administrator will review your contribution. Where appropriate comments may be provided and amendments suggested before your PR is merged into Master.
+- Once your PR is accepted you will be granted push access to the repository you have contributed to! Congratulations on joining our community, you’ll no longer need to work from forks.
+
+If you make a contribution to another repository in the Toolbox you will be expected to repeat this process. Read more about that [here](https://github.com/theodi/toolbox/blob/master/README.md#push-access).
+
+## Code Style Guide
+
+We follow the same code style conventions as detailed in Github’s [Ruby Style Guide](https://github.com/github/rubocop-github/blob/master/STYLEGUIDE.md)

Gemfile

@@ -1,3 +1,5 @@
+ruby "2.1.10"
+
 gem 'rails', '3.2.22'
 gem 'rake', '< 12.0'
 
@@ -134,4 +136,4 @@ gem 'sidekiq'
 gem 'sinatra', :require => nil
 gem 'sidekiq-failures'
 gem 'rails-i18n', '~> 3.0.0'
-gem 'eventmachine', '~> 1.0.4'
+gem 'eventmachine', '~> 1.2.5'