Merge pull request #257 from jasnow/master

Upgraded Ruby, Rails, and associated gems
OWASP · May 31, 2017 · efad3bb · efad3bb
2 parents 3474385 + 4fd868c
commit efad3bb
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 112 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.3
+2.3.4
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - "2.3.3"
+  - "2.3.4"
 
 before_install:
   - "phantomjs --version"

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.3.3
+FROM ruby:2.3.4
 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
@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
 
 #don't upgrade
-gem 'rails', '4.2.7.1'
+gem 'rails', '4.2.8'
 
-ruby '2.3.3'
+ruby '2.3.4'
 
 gem 'rake'