Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating gems #598

Merged
merged 1 commit into from
May 17, 2016
Merged
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
62 changes: 31 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ GIT

GIT
remote: git://github.com/transitland/gtfs.git
revision: 2865634dbdd31ee9674085c3eb1f6cc3ddfbfaa5
tag: 2865634dbdd31ee9674085c3eb1f6cc3ddfbfaa5
revision: 6c8ef14663b1ca57127b1056344a650a6941adf9
tag: 6c8ef14663b1ca57127b1056344a650a6941adf9
specs:
gtfs (1.0.1)
multi_json
Expand Down Expand Up @@ -85,17 +85,17 @@ GEM
rack-test (~> 0.6, >= 0.6.2)
rest-client (~> 1.7, >= 1.7.3)
rspec (~> 3.1, >= 3.1.0)
annotate (2.7.0)
annotate (2.7.1)
activerecord (>= 3.2, < 6.0)
rake (~> 10.4)
rake (>= 10.4, < 12.0)
arel (6.0.3)
ast (2.2.0)
aws-sdk (2.2.34)
aws-sdk-resources (= 2.2.34)
aws-sdk-core (2.2.34)
aws-sdk (2.3.4)
aws-sdk-resources (= 2.3.4)
aws-sdk-core (2.3.4)
jmespath (~> 1.0)
aws-sdk-resources (2.2.34)
aws-sdk-core (= 2.2.34)
aws-sdk-resources (2.3.4)
aws-sdk-core (= 2.3.4)
bcrypt (3.1.11)
better_errors (2.1.1)
coderay (>= 1.0.0)
Expand All @@ -107,18 +107,18 @@ GEM
bullet (5.0.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0)
byebug (8.2.4)
byebug (9.0.3)
c_geohash (1.1.2)
choice (0.2.0)
chronic (0.10.2)
coderay (1.1.1)
concurrent-ruby (1.0.1)
concurrent-ruby (1.0.2)
connection_pool (2.2.0)
crack (0.4.3)
safe_yaml (~> 1.0.0)
database_cleaner (1.5.2)
database_cleaner (1.5.3)
debug_inspector (0.0.2)
devise (4.0.0)
devise (4.1.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1)
Expand Down Expand Up @@ -149,17 +149,17 @@ GEM
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-core (1.37.0)
fog-core (1.39.0)
builder
excon (~> 0.45)
excon (~> 0.49)
formatador (~> 0.2)
fog-json (1.0.2)
fog-core (~> 1.0)
multi_json (~> 1.10)
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
foreman (0.78.0)
foreman (0.81.0)
thor (~> 0.19.1)
formatador (0.2.5)
globalid (0.3.6)
Expand Down Expand Up @@ -194,20 +194,20 @@ GEM
mime-types (2.99.1)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
minitest (5.9.0)
mock_redis (0.16.1)
multi_json (1.11.2)
multi_json (1.12.0)
multipart-post (2.0.0)
netrc (0.11.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
oj (2.15.0)
oj_mimic_json (1.0.1)
orm_adapter (0.5.0)
parser (2.3.0.7)
parser (2.3.1.0)
ast (~> 2.2)
pg (0.18.4)
pghero (1.2.2)
pghero (1.2.4)
activerecord
polyamorous (1.1.0)
activerecord (>= 3.0)
Expand All @@ -216,8 +216,8 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.3.0)
byebug (~> 8.0)
pry-byebug (3.4.0)
byebug (~> 9.0)
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
Expand Down Expand Up @@ -250,7 +250,7 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-erd (1.4.6)
rails-erd (1.4.7)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
Expand All @@ -264,7 +264,7 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
raindrops (0.16.0)
rake (10.5.0)
rake (11.1.2)
rcsv (0.3.1)
redis (3.3.0)
redis-actionpack (4.0.1)
Expand All @@ -284,7 +284,7 @@ GEM
redis-store (1.1.7)
redis (>= 2.2)
request_store (1.3.1)
responders (2.1.2)
responders (2.2.0)
railties (>= 4.2.0, < 5.1)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
Expand Down Expand Up @@ -332,12 +332,12 @@ GEM
rubocop-rspec (1.4.1)
rubocop (= 0.39.0)
ruby-graphviz (1.2.2)
ruby-progressbar (1.7.5)
ruby-progressbar (1.8.1)
rubyzip (1.2.0)
safe_yaml (1.0.4)
sentry-raven (0.15.6)
sentry-raven (1.0.0)
faraday (>= 0.7.6)
sidekiq (4.1.1)
sidekiq (4.1.2)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
redis (~> 3.2, >= 3.2.1)
Expand Down Expand Up @@ -370,22 +370,22 @@ GEM
text (1.3.1)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
tilt (2.0.4)
timecop (0.8.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.0.3)
unicode-display_width (1.0.5)
unicorn (5.1.0)
kgio (~> 2.6)
raindrops (~> 0.7)
uniform_notifier (1.9.0)
vcr (3.0.1)
warden (1.2.6)
rack (>= 1.0)
webmock (1.24.3)
webmock (2.0.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
Expand Down