Merge pull request #741 from RickCarlino/dep_upgrades

Dep upgrades
pull/742/head
Rick Carlino 2018-03-22 13:37:16 -05:00 committed by GitHub
commit b470b256a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 13 deletions

View File

@ -15,14 +15,11 @@ gem "rack-attack"
gem "paperclip" gem "paperclip"
gem "figaro" gem "figaro"
gem "fog-google", git: "https://github.com/fog/fog-google" gem "fog-google", git: "https://github.com/fog/fog-google"
gem "pg", "0.21.0" # TODO: Why can't I upgrade to 1.0.0? gem "pg"
gem "polymorphic_constraints" gem "polymorphic_constraints"
gem "tzinfo" # For validation of user selected timezone names gem "tzinfo" # For validation of user selected timezone names
gem "foreman" gem "foreman"
gem "webpack-rails" gem "webpack-rails"
# Error reporting tools.
# Active on the "official" FarmBot server, set the appropriate ENV
# vars if you wish to use them on your own servers.
gem "rollbar" gem "rollbar"
gem "skylight" gem "skylight"
gem "bunny" gem "bunny"
@ -40,9 +37,6 @@ group :development, :test do
gem "faker" gem "faker"
gem "smarf_doc", git: "https://github.com/RickCarlino/smarf_doc.git" gem "smarf_doc", git: "https://github.com/RickCarlino/smarf_doc.git"
gem "rails-erd" gem "rails-erd"
# TODO: Upgrade versions when they fix this stuff:
# https://stackoverflow.com/questions/43983466
# /controller-test-emits-debug-failure-messages-after-rails-5-1-upgrade
gem "rspec" gem "rspec"
gem "rspec-rails" gem "rspec-rails"
gem "simplecov" gem "simplecov"

View File

@ -165,7 +165,7 @@ GEM
logging (2.2.2) logging (2.2.2)
little-plugger (~> 1.1) little-plugger (~> 1.1)
multi_json (~> 1.10) multi_json (~> 1.10)
loofah (2.2.0) loofah (2.2.2)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.0) mail (2.7.0)
@ -183,7 +183,7 @@ GEM
multipart-post (2.0.0) multipart-post (2.0.0)
mutations (0.8.1) mutations (0.8.1)
activesupport activesupport
nio4r (2.2.0) nio4r (2.3.0)
nokogiri (1.8.2) nokogiri (1.8.2)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0) orm_adapter (0.5.0)
@ -194,7 +194,7 @@ GEM
mime-types mime-types
mimemagic (~> 0.3.0) mimemagic (~> 0.3.0)
terrapin (~> 0.6.0) terrapin (~> 0.6.0)
pg (0.21.0) pg (1.0.0)
polymorphic_constraints (1.0.0) polymorphic_constraints (1.0.0)
rails rails
pry (0.11.3) pry (0.11.3)
@ -242,7 +242,7 @@ GEM
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (12.3.0) rake (12.3.1)
representable (3.0.4) representable (3.0.4)
declarative (< 0.1.0) declarative (< 0.1.0)
declarative-option (< 0.2.0) declarative-option (< 0.2.0)
@ -293,7 +293,7 @@ GEM
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.2) simplecov-html (0.10.2)
skylight (1.5.1) skylight (1.6.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
sprockets (3.7.1) sprockets (3.7.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
@ -350,7 +350,7 @@ DEPENDENCIES
letter_opener letter_opener
mutations mutations
paperclip paperclip
pg (= 0.21.0) pg
polymorphic_constraints polymorphic_constraints
pry pry
pry-rails pry-rails