Skip to content

Commit

Permalink
Merge pull request #680 from transitland/rails-4.2.7-and-gem-updates
Browse files Browse the repository at this point in the history
upgrade to Rails 4.2.7 and update gems
  • Loading branch information
drewda committed Jul 14, 2016
2 parents cfd81ad + 5cec4e7 commit 13458ab
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 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.6'
gem 'rails', '4.2.7'

# Transitland Datastore components
path 'components' do
Expand Down
70 changes: 35 additions & 35 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
actionmailer (4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.6)
actionview (= 4.2.6)
activesupport (= 4.2.6)
actionpack (4.2.7)
actionview (= 4.2.7)
activesupport (= 4.2.7)
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.6)
activesupport (= 4.2.6)
actionview (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
Expand All @@ -52,22 +52,22 @@ GEM
activemodel (>= 3.2)
active_record_doctor (1.1.1)
rails (~> 4.2)
activejob (4.2.6)
activesupport (= 4.2.6)
activejob (4.2.7)
activesupport (= 4.2.7)
globalid (>= 0.3.0)
activemodel (4.2.6)
activesupport (= 4.2.6)
activemodel (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
activerecord (4.2.6)
activemodel (= 4.2.6)
activesupport (= 4.2.6)
activerecord (4.2.7)
activemodel (= 4.2.7)
activesupport (= 4.2.7)
arel (~> 6.0)
activerecord-import (0.15.0)
activerecord (>= 3.2)
activerecord-postgis-adapter (3.1.4)
activerecord (~> 4.2)
rgeo-activerecord (>= 4.0.4)
activesupport (4.2.6)
activesupport (4.2.7)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -84,12 +84,12 @@ GEM
rake (>= 10.4, < 12.0)
arel (6.0.3)
ast (2.3.0)
aws-sdk (2.3.21)
aws-sdk-resources (= 2.3.21)
aws-sdk-core (2.3.21)
aws-sdk (2.3.22)
aws-sdk-resources (= 2.3.22)
aws-sdk-core (2.3.22)
jmespath (~> 1.0)
aws-sdk-resources (2.3.21)
aws-sdk-core (= 2.3.21)
aws-sdk-resources (2.3.22)
aws-sdk-core (= 2.3.22)
bcrypt (3.1.11)
better_errors (2.1.1)
coderay (>= 1.0.0)
Expand Down Expand Up @@ -225,16 +225,16 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.6)
actionmailer (= 4.2.6)
actionpack (= 4.2.6)
actionview (= 4.2.6)
activejob (= 4.2.6)
activemodel (= 4.2.6)
activerecord (= 4.2.6)
activesupport (= 4.2.6)
rails (4.2.7)
actionmailer (= 4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
activemodel (= 4.2.7)
activerecord (= 4.2.7)
activesupport (= 4.2.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.6)
railties (= 4.2.7)
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.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
Expand Down Expand Up @@ -428,7 +428,7 @@ DEPENDENCIES
pry-rescue
pry-stack_explorer
rack-cors
rails (= 4.2.6)
rails (= 4.2.7)
rails-erd
redis-rails
rgeo-geojson
Expand Down

0 comments on commit 13458ab

Please sign in to comment.