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

Update google_drive gem to 2.1.2 and google-api-client gem to 0.10.3 #15995

Merged
merged 1 commit into from Jun 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -30,7 +30,7 @@ gem 'seamless_database_pool', github: 'wjordan/seamless_database_pool', ref: 'cd

gem 'dalli' # memcached
gem 'dalli-elasticache' # ElastiCache Auto Discovery memcached nodes
gem 'google_drive', '~> 1.0.0'
gem 'google_drive'
gem 'le', '~> 2.2'
gem 'os'
gem 'parallel'
Expand Down
48 changes: 24 additions & 24 deletions Gemfile.lock
Expand Up @@ -187,10 +187,6 @@ GEM
attr_required (1.0.1)
auto_strip_attributes (2.1.0)
activerecord (>= 3.0)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
aws-sdk (2.9.14)
aws-sdk-resources (= 2.9.14)
aws-sdk-core (2.9.14)
Expand Down Expand Up @@ -268,6 +264,8 @@ GEM
dalli-elasticache (0.2.0)
dalli (>= 1.0.0)
debug_inspector (0.0.2)
declarative (0.0.9)
declarative-option (0.1.0)
devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -285,7 +283,6 @@ GEM
eventmachine (1.2.0.1)
execjs (2.7.0)
exifr (1.2.5)
extlib (0.9.16)
eyes_core (3.5.4)
chunky_png (= 1.3.6)
faraday
Expand Down Expand Up @@ -321,22 +318,19 @@ GEM
gli (2.14.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
google-api-client (0.8.6)
activesupport (>= 3.2)
google-api-client (0.10.3)
addressable (~> 2.3)
autoparse (~> 0.3)
extlib (~> 0.9)
faraday (~> 0.9)
googleauth (~> 0.3)
launchy (~> 2.4)
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
google_drive (1.0.6)
google-api-client (>= 0.7.0, < 0.9)
nokogiri (>= 1.4.4, != 1.5.2, != 1.5.1)
oauth (>= 0.3.6)
oauth2 (>= 0.5.0)
googleauth (~> 0.5)
httpclient (~> 2.7)
hurley (~> 0.1)
memoist (~> 0.11)
mime-types (>= 1.6)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google_drive (2.1.2)
google-api-client (>= 0.9.0, < 1.0.0)
googleauth (>= 0.5.0, < 1.0.0)
nokogiri (>= 1.5.3, < 2.0.0)
googleauth (0.5.1)
faraday (~> 0.9)
jwt (~> 1.4)
Expand Down Expand Up @@ -375,6 +369,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.2.2)
hurley (0.2)
i18n (0.8.1)
image_size (1.5.0)
in_threads (1.4.0)
Expand Down Expand Up @@ -410,7 +405,7 @@ GEM
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
little-plugger (1.1.4)
logging (2.1.0)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
lograge (0.4.1)
Expand All @@ -422,7 +417,7 @@ GEM
mail (2.6.4)
mime-types (>= 1.16, < 4)
marked-rails (0.3.2.0)
memoist (0.14.0)
memoist (0.15.0)
metaclass (0.0.4)
method_source (0.8.2)
mime-types (3.1)
Expand Down Expand Up @@ -575,6 +570,10 @@ GEM
redcarpet (3.3.4)
redis (3.3.3)
ref (2.0.0)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
rerun (0.10.0)
listen (~> 2.7, >= 2.7.3)
responders (2.2.0)
Expand All @@ -583,7 +582,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (1.4.1)
retriable (3.0.2)
retryable (2.0.4)
rmagick (2.15.4)
rspec (3.5.0)
Expand Down Expand Up @@ -686,6 +685,7 @@ GEM
multi_json (>= 1.3.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uber (0.1.0)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
Expand Down Expand Up @@ -775,7 +775,7 @@ DEPENDENCIES
gemoji
geocoder!
google-api-client
google_drive (~> 1.0.0)
google_drive
haml
haml-rails
haml_lint
Expand Down