Merge pull request #329 from jasnow/master

cktricky · web-flow · commit db5768f64e0e · 2018-03-01T11:54:48.000-05:00
LGTM 👍
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.4.3
+2.5.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - "2.4.3"
+  - "2.5.0"
 
 before_install:
   - "phantomjs --version"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4.3
+FROM ruby:2.5.0
 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
 RUN mkdir /myapp
 WORKDIR /myapp
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ source "https://rubygems.org"
 #don't upgrade
 gem "rails", "5.1.5"
 
-ruby "2.4.3"
+ruby "2.5.0"
 
 gem "aruba"
 gem "bcrypt"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -201,7 +201,7 @@ GEM
     rack (2.0.4)
     rack-livereload (0.3.16)
       rack
-    rack-test (0.8.2)
+    rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rails (5.1.5)
       actioncable (= 5.1.5)
@@ -370,7 +370,7 @@ DEPENDENCIES
   unicorn
 
 RUBY VERSION
-   ruby 2.4.3p205
+   ruby 2.5.0p0
 
 BUNDLED WITH
    1.16.1
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ If you are looking for support or troubleshooting assistance, please visit our [
 To begin, install the Ruby Version Manager (RVM):
 
 ```bash
-$ curl -L https://get.rvm.io | bash -s stable --autolibs=3 --ruby=2.4.3
+$ curl -L https://get.rvm.io | bash -s stable --autolibs=3 --ruby=2.5.0
 ```
 
 After installing the package, clone this repo:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ruby:2.4.3`
	`1`	`+FROM ruby:2.5.0`
`2`	`2`	`RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs`
`3`	`3`	`RUN mkdir /myapp`
`4`	`4`	`WORKDIR /myapp`