Merge pull request #79 from smcgov/upstream-updates

Upstream updates
smcgov · Nov 28, 2015 · 6c55ff2 · 6c55ff2
2 parents c6fe9bb + 7f86a8e
commit 6c55ff2
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 93 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.2.2
+2.2.3
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ cache: bundler
 sudo: false
 script: bundle exec rspec
 rvm:
-- 2.2.2
+- 2.2.3
 deploy:
   provider: heroku
   app: ohana-staging

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.2.2'
+ruby '2.2.3'
 gem 'railties', '~> 4.2'
 gem 'actionmailer'
 
@@ -79,9 +79,9 @@ end
 
 group :test do
   gem 'coveralls', require: false
-  gem 'capybara', '~> 2.4.1'
+  gem 'capybara', '~> 2.4'
   gem 'poltergeist'
-  gem 'vcr', '~> 2.9.0'
+  gem 'vcr', git: 'https://github.com/vcr/vcr.git'
   gem 'webmock', '~> 1.20'
   gem 'email_spec', '~> 1.6.0'
   gem 'haml-lint'