Merge pull request #329 from jasnow/master

LGTM 👍
This commit is contained in:
Ken Johnson
2018-03-01 11:54:48 -05:00
committed by GitHub
6 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -1 +1 @@
2.4.3 2.5.0
+1 -1
View File
@@ -1,6 +1,6 @@
language: ruby language: ruby
rvm: rvm:
- "2.4.3" - "2.5.0"
before_install: before_install:
- "phantomjs --version" - "phantomjs --version"
+1 -1
View File
@@ -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 apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
RUN mkdir /myapp RUN mkdir /myapp
WORKDIR /myapp WORKDIR /myapp
+1 -1
View File
@@ -4,7 +4,7 @@ source "https://rubygems.org"
#don't upgrade #don't upgrade
gem "rails", "5.1.5" gem "rails", "5.1.5"
ruby "2.4.3" ruby "2.5.0"
gem "aruba" gem "aruba"
gem "bcrypt" gem "bcrypt"
+2 -2
View File
@@ -201,7 +201,7 @@ GEM
rack (2.0.4) rack (2.0.4)
rack-livereload (0.3.16) rack-livereload (0.3.16)
rack rack
rack-test (0.8.2) rack-test (0.8.3)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.1.5) rails (5.1.5)
actioncable (= 5.1.5) actioncable (= 5.1.5)
@@ -370,7 +370,7 @@ DEPENDENCIES
unicorn unicorn
RUBY VERSION RUBY VERSION
ruby 2.4.3p205 ruby 2.5.0p0
BUNDLED WITH BUNDLED WITH
1.16.1 1.16.1
+1 -1
View File
@@ -11,7 +11,7 @@ If you are looking for support or troubleshooting assistance, please visit our [
To begin, install the Ruby Version Manager (RVM): To begin, install the Ruby Version Manager (RVM):
```bash ```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: After installing the package, clone this repo: