Skip to content

Commit

Permalink
Merge pull request #218 from Vizzuality/feature/bump-octokit
Browse files Browse the repository at this point in the history
Upgrade octokit to remove warning from Faraday on server startup
  • Loading branch information
simaob authored Jan 7, 2020
2 parents cba205e + 29cfcd5 commit ad8fe1d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ gem 'devise', '>= 4.7.1'
gem 'cancancan'
gem 'draper'

gem 'octokit', '~> 4.0'
gem 'octokit', '~> 4.15.0'

gem 'google-cloud-storage', require: false

Expand Down
9 changes: 5 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ GEM
factory_bot_rails (5.1.1)
factory_bot (~> 5.1.0)
railties (>= 4.2.0)
faraday (0.17.1)
faraday (0.17.3)
multipart-post (>= 1.2, < 3)
ffi (1.11.3)
font-awesome-rails (4.7.0.5)
Expand Down Expand Up @@ -273,7 +273,8 @@ GEM
nio4r (2.5.2)
nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
octokit (4.14.0)
octokit (4.15.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
orm_adapter (0.5.0)
os (1.0.1)
Expand All @@ -291,7 +292,7 @@ GEM
activerecord (>= 3.0)
i18n (>= 0.5.0)
railties (>= 3.0.0)
public_suffix (4.0.1)
public_suffix (4.0.3)
puma (4.3.1)
nio4r (~> 2.0)
rack (2.0.8)
Expand Down Expand Up @@ -506,7 +507,7 @@ DEPENDENCIES
image_processing
language_list
listen (>= 3.0.5, < 3.2)
octokit (~> 4.0)
octokit (~> 4.15.0)
pg (>= 0.18, < 2.0)
pg_search
public_activity
Expand Down

0 comments on commit ad8fe1d

Please sign in to comment.