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

Bump rails to 4.1.16 #94

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
sudo: false
cache: bundler
script:
- RAILS_ENV=test bundle exec rake --trace db:migrate default
env:
global:
- RAILS_ENV=test
Expand Down
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.2.6"
#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
72 changes: 39 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.13)
actionpack (= 4.0.13)
actionmailer (4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
mail (~> 2.5, >= 2.5.4)
actionpack (4.0.13)
activesupport (= 4.0.13)
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.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
activerecord (4.0.13)
activemodel (= 4.0.13)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.13)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.4)
activesupport (4.0.13)
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)
autoprefixer-rails (7.1.2.1)
execjs
backports (3.8.0)
Expand All @@ -35,7 +37,7 @@ GEM
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
bootstrap-switch-rails (1.9.0)
builder (3.1.4)
builder (3.2.3)
capybara (2.14.4)
addressable
mime-types (>= 1.16)
Expand Down Expand Up @@ -153,6 +155,7 @@ GEM
hashie (3.5.5)
highline (1.7.8)
hike (1.2.3)
hitimes (1.2.2)
i18n (0.8.5)
jbuilder (2.6.4)
activesupport (>= 3.0.0)
Expand All @@ -175,7 +178,7 @@ GEM
method_source (0.8.2)
mime-types (2.99.3)
mini_portile2 (2.2.0)
minitest (4.7.5)
minitest (5.10.2)
multi_json (1.12.1)
multi_test (0.1.2)
multi_xml (0.6.0)
Expand Down Expand Up @@ -222,22 +225,24 @@ GEM
activesupport
rack-test (0.6.3)
rack (>= 1.0)
rails (4.0.13)
actionmailer (= 4.0.13)
actionpack (= 4.0.13)
activerecord (= 4.0.13)
activesupport (= 4.0.13)
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.13)
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.13)
actionpack (= 4.0.13)
activesupport (= 4.0.13)
railties (4.1.16)
actionpack (= 4.1.16)
activesupport (= 4.1.16)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
Expand Down Expand Up @@ -316,7 +321,8 @@ GEM
turbolinks-source (5.0.3)
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 @@ -360,7 +366,7 @@ DEPENDENCIES
pg
poltergeist
rack-google-analytics
rails (~> 4.0.2)
rails (~> 4.1.16)
rails_12factor
rspec-rails (~> 3.6)
sass-rails (~> 5.0.6)
Expand Down