Skip to content

Commit 0804dc7

Browse files
authored
Merge pull request #409 from DefactoSoftware/marcel/update-ruby-rails
Update ruby rails and some gems
2 parents a456070 + 69c5e06 commit 0804dc7

6 files changed

Lines changed: 90 additions & 89 deletions

File tree

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1
1+
2.4.2

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rvm:
2-
- 2.3.1
2+
- 2.4.2
33
bundler_args: "--without debug development"
44
cache: bundler
55
before_script:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.3.1
1+
FROM ruby:2.4.2
22

33
RUN apt-get update -yqq \
44
&& apt-get install -yqq --no-install-recommends \

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
ruby "2.3.1"
3+
ruby "2.4.2"
44

55
gem "airbrake"
66
gem "bourbon"
@@ -14,10 +14,10 @@ gem "neat"
1414
gem "bitters"
1515
gem "pg"
1616
gem "rack-timeout"
17-
gem "rails", "~> 4.2.5"
17+
gem "rails", "~> 4.2.10"
1818
gem "recipient_interceptor"
1919
gem "sass-rails", "~> 5.0.1"
20-
gem "simple_form", "~> 3.1.0"
20+
gem "simple_form", "~> 3.5.0"
2121
gem "title"
2222
gem "uglifier"
2323
gem "unicorn"
@@ -36,7 +36,7 @@ gem "twitter-text" # hashtag parsing
3636
gem "jquery-atwho-rails", "~> 1.3.2" # autocomplete
3737
gem "haml-rails"
3838
gem "audited-activerecord", "~> 4.0"
39-
gem "paperclip", "4.2.4"
39+
gem "paperclip", "4.3.7"
4040
gem "aws-sdk", "< 2.0"
4141
gem "redcarpet"
4242
gem "holidays"

0 commit comments

Comments
 (0)