Skip to content
This repository has been archived by the owner on Sep 2, 2022. It is now read-only.

Commit

Permalink
Bump rails to 4.1.16
Browse files Browse the repository at this point in the history
Bumps [rails](https://github.com/rails/rails) from 4.0.12 to 4.1.16.
- [Commits](https://github.com/rails/rails/commits)

I'll automatically resolve any conflicts with this PR as long as you don't alter it yourself.

If you'd like to skip this version, you can just close this PR. If you have any feedback just mention @dependabot in the comments below.
  • Loading branch information
dependabot[bot] committed Jun 21, 2017
1 parent 4c33bf4 commit ba96b73
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 40 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ruby "2.1.4"
#ruby-gemset=forkbomb

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 4.0.2'
gem 'rails', '~> 4.1.16'

gem 'dotenv-rails'

Expand Down
83 changes: 44 additions & 39 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.12)
actionpack (= 4.0.12)
actionmailer (4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
mail (~> 2.5, >= 2.5.4)
actionpack (4.0.12)
activesupport (= 4.0.12)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionpack (4.1.16)
actionview (= 4.1.16)
activesupport (= 4.1.16)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.12)
activesupport (= 4.0.12)
builder (~> 3.1.0)
activerecord (4.0.12)
activemodel (= 4.0.12)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.12)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.12)
actionview (4.1.16)
activesupport (= 4.1.16)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.16)
activesupport (= 4.1.16)
builder (~> 3.1)
activerecord (4.1.16)
activemodel (= 4.1.16)
activesupport (= 4.1.16)
arel (~> 5.0.0)
activesupport (4.1.16)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
tzinfo (~> 1.1)
addressable (2.4.0)
arel (4.0.2)
arel (5.0.1.20140414130214)
backports (3.8.0)
bcrypt (3.1.9)
bootstrap-sass (3.0.3.0)
sass (~> 3.2)
bootstrap-switch-rails (1.9.0)
builder (3.1.4)
builder (3.2.3)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand Down Expand Up @@ -163,12 +165,12 @@ GEM
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (2.99.3)
mini_portile2 (2.1.0)
minitest (4.7.5)
minitest (5.10.2)
multi_json (1.12.1)
multi_test (0.1.1)
multi_xml (0.6.0)
Expand Down Expand Up @@ -211,27 +213,29 @@ GEM
rack-google-analytics (1.2.0)
actionpack
activesupport
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.0.12)
actionmailer (= 4.0.12)
actionpack (= 4.0.12)
activerecord (= 4.0.12)
activesupport (= 4.0.12)
rails (4.1.16)
actionmailer (= 4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
activemodel (= 4.1.16)
activerecord (= 4.1.16)
activesupport (= 4.1.16)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.12)
railties (= 4.1.16)
sprockets-rails (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (4.0.12)
actionpack (= 4.0.12)
activesupport (= 4.0.12)
railties (4.1.16)
actionpack (= 4.1.16)
activesupport (= 4.1.16)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rake (12.0.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
Expand Down Expand Up @@ -274,12 +278,12 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.1)
slop (3.6.0)
sprockets (2.12.3)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.2)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
Expand All @@ -306,7 +310,8 @@ GEM
coffee-rails
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (0.3.53)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
vcr (3.0.3)
Expand Down Expand Up @@ -350,7 +355,7 @@ DEPENDENCIES
pg
poltergeist
rack-google-analytics
rails (~> 4.0.2)
rails (~> 4.1.16)
rails_12factor
rspec-rails
sass-rails (~> 4.0.0)
Expand Down

0 comments on commit ba96b73

Please sign in to comment.