Skip to content

Commit

Permalink
Merge pull request #870 from transitland/update-gems
Browse files Browse the repository at this point in the history
update gems
  • Loading branch information
drewda authored Dec 5, 2016
2 parents 941d3bd + 04303a7 commit 9e4ad18
Showing 1 changed file with 39 additions and 37 deletions.
76 changes: 39 additions & 37 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ GEM
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
arel (~> 6.0)
activerecord-import (0.16.1)
activerecord-import (0.16.2)
activerecord (>= 3.2)
activerecord-postgis-adapter (3.1.4)
activerecord (~> 4.2)
Expand All @@ -88,12 +88,14 @@ GEM
rake (>= 10.4, < 12.0)
arel (6.0.3)
ast (2.3.0)
aws-sdk (2.6.12)
aws-sdk-resources (= 2.6.12)
aws-sdk-core (2.6.12)
aws-sdk (2.6.32)
aws-sdk-resources (= 2.6.32)
aws-sdk-core (2.6.32)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.6.12)
aws-sdk-core (= 2.6.12)
aws-sdk-resources (2.6.32)
aws-sdk-core (= 2.6.32)
aws-sigv4 (1.0.0)
bcrypt (3.1.11)
better_errors (2.1.1)
coderay (>= 1.0.0)
Expand All @@ -111,7 +113,7 @@ GEM
chronic (0.10.2)
coderay (1.1.1)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
connection_pool (2.2.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
database_cleaner (1.5.3)
Expand All @@ -124,7 +126,7 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.20160826)
domain_name (0.5.20161129)
unf (>= 0.0.5, < 1.0.0)
email_validator (1.6.0)
activemodel
Expand All @@ -137,12 +139,12 @@ GEM
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
railties (>= 3.0.0)
faraday (0.9.2)
faraday (0.10.0)
multipart-post (>= 1.2, < 3)
ffaker (2.2.0)
ffaker (2.3.0)
figaro (1.1.1)
thor (~> 0.14)
fog-aws (0.12.0)
fog-aws (0.13.0)
fog-core (~> 1.38)
fog-json (~> 1.0)
fog-xml (~> 0.1)
Expand All @@ -162,7 +164,7 @@ GEM
formatador (0.2.5)
globalid (0.3.7)
activesupport (>= 4.1.0)
hashdiff (0.3.0)
hashdiff (0.3.1)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.7.0)
Expand All @@ -179,7 +181,7 @@ GEM
jsonapi-renderer (0.1.1.beta1)
kgio (2.10.0)
logstash-event (1.2.02)
logstasher (1.0.1)
logstasher (1.1.0)
activerecord (>= 4.0)
activesupport (>= 4.0)
logstash-event (~> 1.2.0)
Expand All @@ -191,25 +193,25 @@ GEM
marginalia (1.4.0)
actionpack (>= 2.3)
activerecord (>= 2.3)
memory_profiler (0.9.6)
memory_profiler (0.9.7)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
minitest (5.10.1)
multi_json (1.12.1)
multipart-post (2.0.0)
netrc (0.11.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
oj (2.17.5)
oj (2.18.0)
oj_mimic_json (1.0.1)
orm_adapter (0.5.0)
parser (2.3.1.4)
parser (2.3.3.1)
ast (~> 2.2)
pg (0.19.0)
pghero (1.6.0)
pghero (1.6.2)
activerecord
polyamorous (1.1.0)
activerecord (>= 3.0)
Expand All @@ -218,7 +220,7 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.0)
pry-byebug (3.4.1)
byebug (~> 9.0)
pry (~> 0.10)
pry-rails (0.3.4)
Expand All @@ -229,7 +231,7 @@ GEM
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
rack (1.6.4)
rack (1.6.5)
rack-cors (0.4.0)
rack-protection (1.5.3)
rack
Expand Down Expand Up @@ -268,17 +270,17 @@ GEM
raindrops (0.17.0)
rake (11.3.0)
rcsv (0.3.1)
redis (3.3.1)
redis-actionpack (5.0.0)
actionpack (>= 4.0.0, < 6)
redis-rack (~> 2.0.0.pre)
redis-store (~> 1.2.0.pre)
redis (3.3.2)
redis-actionpack (5.0.1)
actionpack (>= 4.0, < 6)
redis-rack (>= 1, < 3)
redis-store (>= 1.1.0, < 1.4.0)
redis-activesupport (5.0.1)
activesupport (>= 3, < 6)
redis-store (~> 1.2.0)
redis-rack (2.0.0.pre)
rack (> 1.5, < 3)
redis-store (~> 1.2.0.pre)
redis-rack (1.6.0)
rack (~> 1.5)
redis-store (~> 1.2.0)
redis-rails (5.0.1)
redis-actionpack (~> 5.0.0)
redis-activesupport (~> 5.0.0)
Expand Down Expand Up @@ -325,21 +327,21 @@ GEM
rspec_junit_formatter (0.2.2)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.44.1)
rubocop (0.46.0)
parser (>= 2.3.1.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-rspec (1.7.0)
rubocop-rspec (1.8.0)
rubocop (>= 0.42.0)
ruby-graphviz (1.2.2)
ruby-progressbar (1.8.1)
rubyzip (1.2.0)
safe_yaml (1.0.4)
sentry-raven (2.1.2)
faraday (>= 0.7.6, < 0.10.x)
sidekiq (4.2.3)
sentry-raven (2.2.0)
faraday (>= 0.7.6, < 1.0)
sidekiq (4.2.7)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
Expand Down Expand Up @@ -373,7 +375,7 @@ GEM
activesupport (>= 3.0)
polyamorous (~> 1.1.0)
text (1.3.1)
thor (0.19.1)
thor (0.19.4)
thread_safe (0.3.5)
tilt (2.0.5)
timecop (0.8.1)
Expand All @@ -383,14 +385,14 @@ GEM
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.1.1)
unicorn (5.1.0)
unicorn (5.2.0)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.10.0)
vcr (3.0.3)
warden (1.2.6)
rack (>= 1.0)
webmock (2.1.0)
webmock (2.3.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
Expand Down Expand Up @@ -464,4 +466,4 @@ DEPENDENCIES
whenever

BUNDLED WITH
1.13.2
1.13.6

0 comments on commit 9e4ad18

Please sign in to comment.