Skip to content

Commit e0b6c5b

Browse files
committed
Bundle update with deleting faraday_middleware (v0.10)
1 parent 8cafc71 commit e0b6c5b

File tree

2 files changed

+32
-42
lines changed

2 files changed

+32
-42
lines changed

Gemfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,10 @@ gem 'secure_headers'
3131
gem 'kramdown'
3232

3333
gem 'faraday'
34-
# TODO: Delete this if the following issue is fixed
35-
# https://github.com/bundler/bundler/issues/5332
36-
gem 'faraday_middleware', '0.10'
37-
3834
gem 'koala'
39-
4035
gem 'rack-user_agent'
41-
4236
gem 'rack-attack'
43-
4437
gem 'google_drive'
45-
4638
gem 'lazy_high_charts'
4739

4840
group :development do

Gemfile.lock

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ GEM
4141
addressable (2.5.2)
4242
public_suffix (>= 2.0.2, < 4.0)
4343
arel (8.0.0)
44-
autoprefixer-rails (9.4.2)
44+
autoprefixer-rails (9.4.3)
4545
execjs
4646
backports (3.11.4)
4747
bindex (0.5.0)
4848
binding_of_caller (0.8.0)
4949
debug_inspector (>= 0.0.1)
50-
bootstrap-sass (3.3.7)
50+
bootstrap-sass (3.4.0)
5151
autoprefixer-rails (>= 5.2.1)
52-
sass (>= 3.3.4)
52+
sassc (>= 2.0.0)
5353
builder (3.2.3)
5454
byebug (10.0.2)
5555
capybara (3.12.0)
@@ -70,7 +70,7 @@ GEM
7070
coffee-script-source
7171
execjs
7272
coffee-script-source (1.12.2)
73-
concurrent-ruby (1.1.3)
73+
concurrent-ruby (1.1.4)
7474
connection_pool (2.2.2)
7575
crass (1.0.4)
7676
debug_inspector (0.0.3)
@@ -85,15 +85,15 @@ GEM
8585
multi_json (>= 1.0)
8686
multipart-post (>= 1.1.5)
8787
posix-spawn (>= 0.3.6)
88-
erubi (1.7.1)
88+
erubi (1.8.0)
8989
erubis (2.7.0)
9090
ethon (0.11.0)
9191
ffi (>= 1.3.0)
9292
execjs (2.7.0)
93-
faraday (0.9.2)
93+
faraday (0.15.4)
9494
multipart-post (>= 1.2, < 3)
95-
faraday_middleware (0.10.0)
96-
faraday (>= 0.7.4, < 0.10)
95+
faraday_middleware (0.12.2)
96+
faraday (>= 0.7.4, < 1.0)
9797
ffi (1.9.25)
9898
flamegraph (0.9.5)
9999
font-awesome-rails (4.7.0.4)
@@ -107,24 +107,24 @@ GEM
107107
net-http-pipeline
108108
globalid (0.4.1)
109109
activesupport (>= 4.2.0)
110-
google-api-client (0.21.2)
110+
google-api-client (0.25.0)
111111
addressable (~> 2.5, >= 2.5.1)
112112
googleauth (>= 0.5, < 0.7.0)
113113
httpclient (>= 2.8.1, < 3.0)
114114
mime-types (~> 3.0)
115115
representable (~> 3.0)
116116
retriable (>= 2.0, < 4.0)
117-
google_drive (3.0.0)
118-
google-api-client (>= 0.11.0, < 0.22.0)
117+
signet (~> 0.10)
118+
google_drive (3.0.1)
119+
google-api-client (>= 0.11.0, < 0.26.0)
119120
googleauth (>= 0.5.0, < 1.0.0)
120121
nokogiri (>= 1.5.3, < 2.0.0)
121-
googleauth (0.5.1)
122-
faraday (~> 0.9)
123-
jwt (~> 1.4)
124-
logging (~> 2.0)
125-
memoist (~> 0.12)
122+
googleauth (0.6.7)
123+
faraday (~> 0.12)
124+
jwt (>= 1.4, < 3.0)
125+
memoist (~> 0.16)
126126
multi_json (~> 1.11)
127-
os (~> 0.9)
127+
os (>= 0.9, < 2.0)
128128
signet (~> 0.7)
129129
haml (5.0.4)
130130
temple (>= 0.8.0)
@@ -143,10 +143,10 @@ GEM
143143
nokogiri (>= 1.6.0)
144144
ruby_parser (~> 3.5)
145145
httpclient (2.8.3)
146-
hyp_diff (0.0.5)
147-
diff-lcs (~> 1.2, >= 1.2.5)
148-
nokogiri (~> 1.6, >= 1.6.5)
149-
i18n (1.1.1)
146+
hyp_diff (0.0.6)
147+
diff-lcs (>= 1.2, < 2.0)
148+
nokogiri (>= 1.6, < 2.0)
149+
i18n (1.3.0)
150150
concurrent-ruby (~> 1.0)
151151
jbuilder (2.8.0)
152152
activesupport (>= 4.2.0)
@@ -158,7 +158,7 @@ GEM
158158
jquery-ui-rails (6.0.1)
159159
railties (>= 3.2.16)
160160
json (2.1.0)
161-
jwt (1.5.6)
161+
jwt (2.1.0)
162162
koala (3.0.0)
163163
addressable
164164
faraday
@@ -172,10 +172,6 @@ GEM
172172
rb-fsevent (~> 0.9, >= 0.9.4)
173173
rb-inotify (~> 0.9, >= 0.9.7)
174174
ruby_dep (~> 1.2)
175-
little-plugger (1.1.4)
176-
logging (2.2.2)
177-
little-plugger (~> 1.1)
178-
multi_json (~> 1.10)
179175
loofah (2.2.3)
180176
crass (~> 1.0.2)
181177
nokogiri (>= 1.5.9)
@@ -188,7 +184,7 @@ GEM
188184
mime-types-data (~> 3.2015)
189185
mime-types-data (3.2018.0812)
190186
mini_mime (1.0.1)
191-
mini_portile2 (2.3.0)
187+
mini_portile2 (2.4.0)
192188
minitest (5.11.3)
193189
minitest-retry (0.1.9)
194190
minitest (>= 5.0)
@@ -198,9 +194,9 @@ GEM
198194
connection_pool (~> 2.2)
199195
net-http-pipeline (1.0.1)
200196
nio4r (2.3.1)
201-
nokogiri (1.8.5)
202-
mini_portile2 (~> 2.3.0)
203-
os (0.9.6)
197+
nokogiri (1.9.1)
198+
mini_portile2 (~> 2.4.0)
199+
os (1.0.0)
204200
pg (1.1.3)
205201
posix-spawn (0.3.13)
206202
pry (0.12.2)
@@ -226,7 +222,7 @@ GEM
226222
rack (>= 1.0, < 3)
227223
rack-host-redirect (1.3.0)
228224
rack
229-
rack-mini-profiler (1.0.0)
225+
rack-mini-profiler (1.0.1)
230226
rack (>= 1.2.0)
231227
rack-test (1.1.0)
232228
rack (>= 1.0, < 3)
@@ -262,8 +258,8 @@ GEM
262258
thor (>= 0.18.1, < 2.0)
263259
rake (12.3.2)
264260
rb-fsevent (0.10.3)
265-
rb-inotify (0.9.10)
266-
ffi (>= 0.5.0, < 2)
261+
rb-inotify (0.10.0)
262+
ffi (~> 1.0)
267263
regexp_parser (1.3.0)
268264
representable (3.0.4)
269265
declarative (< 0.1.0)
@@ -304,6 +300,9 @@ GEM
304300
sprockets (>= 2.8, < 4.0)
305301
sprockets-rails (>= 2.0, < 4.0)
306302
tilt (>= 1.1, < 3)
303+
sassc (2.0.0)
304+
ffi (~> 1.9.6)
305+
rake
307306
scrivito (1.13.0)
308307
scrivito_content_browser (= 1.13.0)
309308
scrivito_editors (= 1.13.0)
@@ -402,7 +401,6 @@ DEPENDENCIES
402401
dotenv-rails
403402
dumper
404403
faraday
405-
faraday_middleware (= 0.10)
406404
flamegraph
407405
font-awesome-rails
408406
google_drive

0 commit comments

Comments
 (0)