Skip to content

Commit

Permalink
Merge pull request #1119 from transitland/update-rails-and-gems
Browse files Browse the repository at this point in the history
upgrading to Rails 4.2.9 & updating gems
  • Loading branch information
irees committed Jun 29, 2017
2 parents fb0dbfc + 2fe226c commit b2827f9
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '4.2.8'
gem 'rails', '4.2.9'

# Transitland Datastore components
path 'components' do
Expand Down
88 changes: 44 additions & 44 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
actionmailer (4.2.9)
actionpack (= 4.2.9)
actionview (= 4.2.9)
activejob (= 4.2.9)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
actionpack (4.2.9)
actionview (= 4.2.9)
activesupport (= 4.2.9)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.8)
activesupport (= 4.2.8)
actionview (4.2.9)
activesupport (= 4.2.9)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
Expand All @@ -45,22 +45,22 @@ GEM
active_record_doctor (1.3.1)
activerecord (>= 4.2)
railties (>= 4.2)
activejob (4.2.8)
activesupport (= 4.2.8)
activejob (4.2.9)
activesupport (= 4.2.9)
globalid (>= 0.3.0)
activemodel (4.2.8)
activesupport (= 4.2.8)
activemodel (4.2.9)
activesupport (= 4.2.9)
builder (~> 3.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
activerecord (4.2.9)
activemodel (= 4.2.9)
activesupport (= 4.2.9)
arel (~> 6.0)
activerecord-import (0.18.3)
activerecord-import (0.19.0)
activerecord (>= 3.2)
activerecord-postgis-adapter (3.1.5)
activerecord (~> 4.2)
rgeo-activerecord (>= 4.0.4)
activesupport (4.2.8)
activesupport (4.2.9)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
Expand All @@ -77,13 +77,13 @@ GEM
activerecord (>= 3.2, < 6.0)
rake (>= 10.4, < 13.0)
arel (6.0.4)
aws-sdk (2.9.37)
aws-sdk-resources (= 2.9.37)
aws-sdk-core (2.9.37)
aws-sdk (2.10.3)
aws-sdk-resources (= 2.10.3)
aws-sdk-core (2.10.3)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.9.37)
aws-sdk-core (= 2.9.37)
aws-sdk-resources (2.10.3)
aws-sdk-core (= 2.10.3)
aws-sigv4 (1.0.0)
bcrypt (3.1.11)
better_errors (2.1.1)
Expand Down Expand Up @@ -128,7 +128,7 @@ GEM
enumerize (2.1.2)
activesupport (>= 3.2)
erubis (2.7.0)
excon (0.56.0)
excon (0.57.0)
factory_girl (4.8.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.8.0)
Expand All @@ -139,7 +139,7 @@ GEM
ffaker (2.5.0)
figaro (1.1.1)
thor (~> 0.14)
fog-aws (1.3.0)
fog-aws (1.4.0)
fog-core (~> 1.38)
fog-json (~> 1.0)
fog-xml (~> 0.1)
Expand Down Expand Up @@ -196,9 +196,9 @@ GEM
netrc (0.11.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
oj (3.1.0)
oj (3.2.0)
orm_adapter (0.5.0)
pg (0.20.0)
pg (0.21.0)
pghero (1.7.0)
activerecord
polyamorous (1.1.0)
Expand All @@ -225,16 +225,16 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
rails (4.2.9)
actionmailer (= 4.2.9)
actionpack (= 4.2.9)
actionview (= 4.2.9)
activejob (= 4.2.9)
activemodel (= 4.2.9)
activerecord (= 4.2.9)
activesupport (= 4.2.9)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.8)
railties (= 4.2.9)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
Expand All @@ -249,9 +249,9 @@ GEM
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
railties (4.2.9)
actionpack (= 4.2.9)
activesupport (= 4.2.9)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.18.0)
Expand Down Expand Up @@ -308,7 +308,7 @@ GEM
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-support (~> 3.6.0)
rspec-sidekiq (3.0.1)
rspec-sidekiq (3.0.3)
rspec-core (~> 3.0, >= 3.0.0)
sidekiq (>= 2.4.0)
rspec-support (3.6.0)
Expand All @@ -319,9 +319,9 @@ GEM
ruby-progressbar (1.8.1)
rubyzip (1.2.1)
safe_yaml (1.0.4)
sentry-raven (2.5.2)
sentry-raven (2.5.3)
faraday (>= 0.7.6, < 1.0)
sidekiq (5.0.2)
sidekiq (5.0.3)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
Expand Down Expand Up @@ -358,7 +358,7 @@ GEM
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.7)
timecop (0.8.1)
timecop (0.9.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
unf (0.1.4)
Expand Down Expand Up @@ -421,7 +421,7 @@ DEPENDENCIES
pry-rescue
pry-stack_explorer
rack-cors
rails (= 4.2.8)
rails (= 4.2.9)
rails-erd
redis
redis-actionpack
Expand Down

0 comments on commit b2827f9

Please sign in to comment.