Skip to content
This repository was archived by the owner on Mar 29, 2022. It is now read-only.

Commit 4ea80c4

Browse files
authored
Merge pull request #459 from digitalocean/kjuell/update-github-auth
Update octokit and omniauth-github to deal with url query params issue
2 parents ba2641d + ccc7947 commit 4ea80c4

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ gem 'loofah', '>= 2.3.1'
2828
# See: https://github.com/sirupsen/airrecord/issues/63
2929
gem 'net-http-persistent', '~> 2.9'
3030

31-
gem 'octokit'
32-
gem 'omniauth-github'
31+
gem 'octokit', '~> 4.18.0'
32+
gem 'omniauth-github', '~> 1.4.0'
3333
gem 'omniauth-rails_csrf_protection', '~> 0.1'
3434

3535
gem 'puma', '~> 4.0'

Gemfile.lock

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ GEM
164164
mini_portile2 (2.4.0)
165165
minitest (5.11.3)
166166
msgpack (1.3.1)
167-
multi_json (1.13.1)
167+
multi_json (1.15.0)
168168
multi_xml (0.6.0)
169169
multipart-post (2.1.1)
170170
nenv (0.3.0)
@@ -178,22 +178,23 @@ GEM
178178
notiffany (0.1.3)
179179
nenv (~> 0.1)
180180
shellany (~> 0.0)
181-
oauth2 (1.4.1)
182-
faraday (>= 0.8, < 0.16.0)
181+
oauth2 (1.4.4)
182+
faraday (>= 0.8, < 2.0)
183183
jwt (>= 1.0, < 3.0)
184184
multi_json (~> 1.3)
185185
multi_xml (~> 0.5)
186186
rack (>= 1.2, < 3)
187-
octokit (4.14.0)
187+
octokit (4.18.0)
188+
faraday (>= 0.9)
188189
sawyer (~> 0.8.0, >= 0.5.3)
189190
omniauth (1.9.0)
190191
hashie (>= 3.4.6, < 3.7.0)
191192
rack (>= 1.6.2, < 3)
192-
omniauth-github (1.3.0)
193+
omniauth-github (1.4.0)
193194
omniauth (~> 1.5)
194195
omniauth-oauth2 (>= 1.4.0, < 2.0)
195-
omniauth-oauth2 (1.6.0)
196-
oauth2 (~> 1.1)
196+
omniauth-oauth2 (1.7.0)
197+
oauth2 (~> 1.4)
197198
omniauth (~> 1.9)
198199
omniauth-rails_csrf_protection (0.1.2)
199200
actionpack (>= 4.2)
@@ -385,8 +386,8 @@ DEPENDENCIES
385386
listen (>= 3.0.5, < 3.2)
386387
loofah (>= 2.3.1)
387388
net-http-persistent (~> 2.9)
388-
octokit
389-
omniauth-github
389+
octokit (~> 4.18.0)
390+
omniauth-github (~> 1.4.0)
390391
omniauth-rails_csrf_protection (~> 0.1)
391392
pg
392393
pry

0 commit comments

Comments
 (0)