Merge remote-tracking branch 'upstream/master' into upstream-updates

.bummr-build.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+bundle exec rspec --fail-fast

.codeclimate.yml

@@ -0,0 +1,35 @@
+engines:
+  brakeman:
+    enabled: true
+  bundler-audit:
+    enabled: true
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+        # mass_threshold: 30
+      - javascript
+    exclude_paths:
+    - 'spec/**/*'
+    - 'vendor/**/*'
+  eslint:
+    enabled: true
+    exclude_paths:
+    - 'vendor/**/*'
+  fixme:
+    enabled: true
+    exclude_paths:
+    - 'vendor/**/*'
+  rubocop:
+    enabled: true
+  scss-lint:
+    enabled: true
+
+ratings:
+  paths:
+  - app/**
+  - lib/**
+  - '**.rb'

.eslintrc

@@ -0,0 +1,31 @@
+{
+  'extends': 'airbnb',
+  'parser': 'babel-eslint',
+  'env': {
+    'browser': true,
+    'commonjs': true,
+    'es6': true,
+    'mocha': true
+  },
+  'globals': {
+    '$': true,
+    '__DEV__': true,
+    'assert': true,
+    'chai': true,
+    'sinon': true,
+    'expect': true,
+    'fixture': true
+  },
+  'rules': {
+    'func-names': 0,
+    'space-before-function-paren': 0,
+    'prefer-arrow-callback': 0
+  },
+  'parserOptions': {
+    'ecmaVersion': 6,
+    'sourceType': 'module',
+    'ecmaFeatures': {
+      'jsx': true
+    }
+  }
+}

.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

.travis.yml

@@ -4,7 +4,7 @@ cache: bundler
 sudo: false
 script: bundle exec rspec
 rvm:
-- 2.2.3
+- 2.3.1
 deploy:
   provider: heroku
   app: ohana-staging

CONTRIBUTING.md

@@ -64,9 +64,6 @@ pass.
 style checkers. If your specs fail and/or style offenses are reported, return
 to **step 7**.
 
-9. _(If applicable)_ **Clean up JavaScript code:** Run `rake jshint` to check
-JavaScript code quality.
-
 10. **Commit changes:** Add, commit, and push your changes.
 
 11. **Pull request:** [Submit a pull request][pr] to send your changes to this

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.2.3'
+ruby '2.3.1'
 gem 'railties', '~> 4.2'
 gem 'actionmailer'
 
@@ -38,7 +38,7 @@ gem 'newrelic_rpm', '>= 3.8.0.218'
 gem 'rack-rewrite', '~> 1.5.0'
 
 # For Google translation API.
-gem 'google-api-client', '~> 0.8.1'
+gem 'google-api-client', '~> 0.8.6'
 
 # App config and ENV variables for heroku.
 gem 'figaro'
@@ -62,9 +62,6 @@ group :development do
   # For mocking emails for sending.
   gem 'letter_opener'
 
-  # For linting JS with `rake jshint`.
-  gem 'jshint'
-
   # For code documentation, run `yard --help` for list of commands.
   gem 'yard'
 
@@ -77,15 +74,18 @@ group :development do
   gem 'derailed'
   gem 'rack-mini-profiler'
   gem 'flamegraph'
+  gem 'stackprof'
+
+  gem 'bummr'
 end
 
 group :test do
   gem 'coveralls', require: false
   gem 'capybara', '~> 2.4'
   gem 'poltergeist'
   gem 'vcr'
-  gem 'webmock', '~> 1.20'
-  gem 'email_spec', '~> 1.6.0'
+  gem 'webmock', '~> 2.1'
+  gem 'email_spec'
   gem 'haml_lint'
 
   # Ruby static code analyzer, based on the community Ruby style guide.