Skip to content

Commit dad2b2b

Browse files
author
remi Taylor
committed
Merge master into new-storage-samples
 - Gemfile was updated with latest dependencies in master
2 parents 6e9bee8 + 678f2f9 commit dad2b2b

File tree

25 files changed

+551
-485
lines changed

25 files changed

+551
-485
lines changed

‎appengine/analytics/Gemfile.lock‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
addressable (2.4.0)
5-
capybara (2.7.0)
5+
capybara (2.9.2)
66
addressable
77
mime-types (>= 1.16)
88
nokogiri (>= 1.3.3)
@@ -11,42 +11,42 @@ GEM
1111
xpath (~> 2.0)
1212
cliver (0.3.2)
1313
diff-lcs (1.2.5)
14-
mime-types (3.0)
14+
mime-types (3.1)
1515
mime-types-data (~> 3.2015)
16-
mime-types-data (3.2016.0221)
17-
mini_portile2 (2.0.0)
18-
multi_json (1.11.2)
19-
nokogiri (1.6.7.2)
20-
mini_portile2 (~> 2.0.0.rc2)
21-
poltergeist (1.9.0)
16+
mime-types-data (3.2016.0521)
17+
mini_portile2 (2.1.0)
18+
nokogiri (1.6.8)
19+
mini_portile2 (~> 2.1.0)
20+
pkg-config (~> 1.1.7)
21+
pkg-config (1.1.7)
22+
poltergeist (1.10.0)
2223
capybara (~> 2.1)
2324
cliver (~> 0.3.1)
24-
multi_json (~> 1.0)
2525
websocket-driver (>= 0.2.0)
2626
rack (1.6.4)
2727
rack-protection (1.5.3)
2828
rack
2929
rack-test (0.6.3)
3030
rack (>= 1.0)
31-
rspec (3.4.0)
32-
rspec-core (~> 3.4.0)
33-
rspec-expectations (~> 3.4.0)
34-
rspec-mocks (~> 3.4.0)
35-
rspec-core (3.4.4)
36-
rspec-support (~> 3.4.0)
37-
rspec-expectations (3.4.0)
31+
rspec (3.5.0)
32+
rspec-core (~> 3.5.0)
33+
rspec-expectations (~> 3.5.0)
34+
rspec-mocks (~> 3.5.0)
35+
rspec-core (3.5.3)
36+
rspec-support (~> 3.5.0)
37+
rspec-expectations (3.5.0)
3838
diff-lcs (>= 1.2.0, < 2.0)
39-
rspec-support (~> 3.4.0)
40-
rspec-mocks (3.4.1)
39+
rspec-support (~> 3.5.0)
40+
rspec-mocks (3.5.0)
4141
diff-lcs (>= 1.2.0, < 2.0)
42-
rspec-support (~> 3.4.0)
43-
rspec-support (3.4.1)
42+
rspec-support (~> 3.5.0)
43+
rspec-support (3.5.0)
4444
sinatra (1.4.7)
4545
rack (~> 1.5)
4646
rack-protection (~> 1.4)
4747
tilt (>= 1.3, < 3)
48-
tilt (2.0.2)
49-
websocket-driver (0.6.3)
48+
tilt (2.0.5)
49+
websocket-driver (0.6.4)
5050
websocket-extensions (>= 0.1.0)
5151
websocket-extensions (0.1.2)
5252
xpath (2.0.0)

‎appengine/cloudsql/Gemfile.lock‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
addressable (2.4.0)
5-
capybara (2.7.0)
5+
capybara (2.9.2)
66
addressable
77
mime-types (>= 1.16)
88
nokogiri (>= 1.3.3)
@@ -11,44 +11,44 @@ GEM
1111
xpath (~> 2.0)
1212
cliver (0.3.2)
1313
diff-lcs (1.2.5)
14-
mime-types (3.0)
14+
mime-types (3.1)
1515
mime-types-data (~> 3.2015)
16-
mime-types-data (3.2016.0221)
17-
mini_portile2 (2.0.0)
18-
multi_json (1.11.2)
19-
mysql2 (0.4.3)
20-
nokogiri (1.6.7.2)
21-
mini_portile2 (~> 2.0.0.rc2)
22-
poltergeist (1.9.0)
16+
mime-types-data (3.2016.0521)
17+
mini_portile2 (2.1.0)
18+
mysql2 (0.4.4)
19+
nokogiri (1.6.8)
20+
mini_portile2 (~> 2.1.0)
21+
pkg-config (~> 1.1.7)
22+
pkg-config (1.1.7)
23+
poltergeist (1.10.0)
2324
capybara (~> 2.1)
2425
cliver (~> 0.3.1)
25-
multi_json (~> 1.0)
2626
websocket-driver (>= 0.2.0)
2727
rack (1.6.4)
2828
rack-protection (1.5.3)
2929
rack
3030
rack-test (0.6.3)
3131
rack (>= 1.0)
32-
rspec (3.4.0)
33-
rspec-core (~> 3.4.0)
34-
rspec-expectations (~> 3.4.0)
35-
rspec-mocks (~> 3.4.0)
36-
rspec-core (3.4.4)
37-
rspec-support (~> 3.4.0)
38-
rspec-expectations (3.4.0)
32+
rspec (3.5.0)
33+
rspec-core (~> 3.5.0)
34+
rspec-expectations (~> 3.5.0)
35+
rspec-mocks (~> 3.5.0)
36+
rspec-core (3.5.3)
37+
rspec-support (~> 3.5.0)
38+
rspec-expectations (3.5.0)
3939
diff-lcs (>= 1.2.0, < 2.0)
40-
rspec-support (~> 3.4.0)
41-
rspec-mocks (3.4.1)
40+
rspec-support (~> 3.5.0)
41+
rspec-mocks (3.5.0)
4242
diff-lcs (>= 1.2.0, < 2.0)
43-
rspec-support (~> 3.4.0)
44-
rspec-support (3.4.1)
45-
sequel (4.32.0)
43+
rspec-support (~> 3.5.0)
44+
rspec-support (3.5.0)
45+
sequel (4.38.0)
4646
sinatra (1.4.7)
4747
rack (~> 1.5)
4848
rack-protection (~> 1.4)
4949
tilt (>= 1.3, < 3)
50-
tilt (2.0.2)
51-
websocket-driver (0.6.3)
50+
tilt (2.0.5)
51+
websocket-driver (0.6.4)
5252
websocket-extensions (>= 0.1.0)
5353
websocket-extensions (0.1.2)
5454
xpath (2.0.0)

‎appengine/datastore/Gemfile.lock‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GEM
1111
google-protobuf (~> 3.0)
1212
googleapis-common-protos (~> 1.2)
1313
grpc (~> 1.0)
14-
google-protobuf (3.0.2)
14+
google-protobuf (3.1.0)
1515
googleapis-common-protos (1.3.1)
1616
google-protobuf (~> 3.0)
1717
grpc (~> 1.0)
@@ -38,19 +38,19 @@ GEM
3838
rack (1.6.4)
3939
rack-protection (1.5.3)
4040
rack
41-
rspec (3.4.0)
42-
rspec-core (~> 3.4.0)
43-
rspec-expectations (~> 3.4.0)
44-
rspec-mocks (~> 3.4.0)
45-
rspec-core (3.4.2)
46-
rspec-support (~> 3.4.0)
47-
rspec-expectations (3.4.0)
41+
rspec (3.5.0)
42+
rspec-core (~> 3.5.0)
43+
rspec-expectations (~> 3.5.0)
44+
rspec-mocks (~> 3.5.0)
45+
rspec-core (3.5.3)
46+
rspec-support (~> 3.5.0)
47+
rspec-expectations (3.5.0)
4848
diff-lcs (>= 1.2.0, < 2.0)
49-
rspec-support (~> 3.4.0)
50-
rspec-mocks (3.4.1)
49+
rspec-support (~> 3.5.0)
50+
rspec-mocks (3.5.0)
5151
diff-lcs (>= 1.2.0, < 2.0)
52-
rspec-support (~> 3.4.0)
53-
rspec-support (3.4.1)
52+
rspec-support (~> 3.5.0)
53+
rspec-support (3.5.0)
5454
signet (0.7.3)
5555
addressable (~> 2.3)
5656
faraday (~> 0.9)
@@ -60,7 +60,7 @@ GEM
6060
rack (~> 1.5)
6161
rack-protection (~> 1.4)
6262
tilt (>= 1.3, < 3)
63-
tilt (2.0.2)
63+
tilt (2.0.5)
6464

6565
PLATFORMS
6666
ruby

‎appengine/endpoints/Gemfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ GEM
33
specs:
44
addressable (2.4.0)
55
diff-lcs (1.2.5)
6-
domain_name (0.5.20160615)
6+
domain_name (0.5.20160826)
77
unf (>= 0.0.5, < 1.0.0)
88
faraday (0.9.2)
99
multipart-post (>= 1.2, < 3)
1010
http-cookie (1.0.2)
1111
domain_name (~> 0.5)
1212
json (2.0.2)
13-
jwt (1.5.4)
13+
jwt (1.5.6)
1414
mime-types (3.1)
1515
mime-types-data (~> 3.2015)
1616
mime-types-data (3.2016.0521)
@@ -30,7 +30,7 @@ GEM
3030
rspec-core (~> 3.5.0)
3131
rspec-expectations (~> 3.5.0)
3232
rspec-mocks (~> 3.5.0)
33-
rspec-core (3.5.2)
33+
rspec-core (3.5.3)
3434
rspec-support (~> 3.5.0)
3535
rspec-expectations (3.5.0)
3636
diff-lcs (>= 1.2.0, < 2.0)

‎appengine/hello_world/Gemfile.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ GEM
55
rack (1.6.4)
66
rack-protection (1.5.3)
77
rack
8-
rspec (3.4.0)
9-
rspec-core (~> 3.4.0)
10-
rspec-expectations (~> 3.4.0)
11-
rspec-mocks (~> 3.4.0)
12-
rspec-core (3.4.1)
13-
rspec-support (~> 3.4.0)
14-
rspec-expectations (3.4.0)
8+
rspec (3.5.0)
9+
rspec-core (~> 3.5.0)
10+
rspec-expectations (~> 3.5.0)
11+
rspec-mocks (~> 3.5.0)
12+
rspec-core (3.5.3)
13+
rspec-support (~> 3.5.0)
14+
rspec-expectations (3.5.0)
1515
diff-lcs (>= 1.2.0, < 2.0)
16-
rspec-support (~> 3.4.0)
17-
rspec-mocks (3.4.0)
16+
rspec-support (~> 3.5.0)
17+
rspec-mocks (3.5.0)
1818
diff-lcs (>= 1.2.0, < 2.0)
19-
rspec-support (~> 3.4.0)
20-
rspec-support (3.4.1)
19+
rspec-support (~> 3.5.0)
20+
rspec-support (3.5.0)
2121
sinatra (1.4.7)
2222
rack (~> 1.5)
2323
rack-protection (~> 1.4)
2424
tilt (>= 1.3, < 3)
25-
tilt (2.0.2)
25+
tilt (2.0.5)
2626

2727
PLATFORMS
2828
ruby

‎appengine/mailgun/Gemfile.lock‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
addressable (2.4.0)
5-
capybara (2.7.0)
5+
capybara (2.9.2)
66
addressable
77
mime-types (>= 1.16)
88
nokogiri (>= 1.3.3)
@@ -11,48 +11,56 @@ GEM
1111
xpath (~> 2.0)
1212
cliver (0.3.2)
1313
diff-lcs (1.2.5)
14+
domain_name (0.5.20160826)
15+
unf (>= 0.0.5, < 1.0.0)
16+
http-cookie (1.0.2)
17+
domain_name (~> 0.5)
1418
json (1.8.3)
1519
mailgun-ruby (1.1.0)
1620
json (~> 1.8)
1721
rest-client (~> 1.6)
18-
mime-types (3.0)
19-
mime-types-data (~> 3.2015)
20-
mime-types-data (3.2016.0221)
21-
mini_portile2 (2.0.0)
22-
multi_json (1.11.2)
23-
nokogiri (1.6.7.2)
24-
mini_portile2 (~> 2.0.0.rc2)
25-
poltergeist (1.9.0)
22+
mime-types (2.99.3)
23+
mini_portile2 (2.1.0)
24+
netrc (0.11.0)
25+
nokogiri (1.6.8)
26+
mini_portile2 (~> 2.1.0)
27+
pkg-config (~> 1.1.7)
28+
pkg-config (1.1.7)
29+
poltergeist (1.10.0)
2630
capybara (~> 2.1)
2731
cliver (~> 0.3.1)
28-
multi_json (~> 1.0)
2932
websocket-driver (>= 0.2.0)
3033
rack (1.6.4)
3134
rack-protection (1.5.3)
3235
rack
3336
rack-test (0.6.3)
3437
rack (>= 1.0)
35-
rest-client (1.6.7)
36-
mime-types (>= 1.16)
37-
rspec (3.4.0)
38-
rspec-core (~> 3.4.0)
39-
rspec-expectations (~> 3.4.0)
40-
rspec-mocks (~> 3.4.0)
41-
rspec-core (3.4.4)
42-
rspec-support (~> 3.4.0)
43-
rspec-expectations (3.4.0)
38+
rest-client (1.8.0)
39+
http-cookie (>= 1.0.2, < 2.0)
40+
mime-types (>= 1.16, < 3.0)
41+
netrc (~> 0.7)
42+
rspec (3.5.0)
43+
rspec-core (~> 3.5.0)
44+
rspec-expectations (~> 3.5.0)
45+
rspec-mocks (~> 3.5.0)
46+
rspec-core (3.5.3)
47+
rspec-support (~> 3.5.0)
48+
rspec-expectations (3.5.0)
4449
diff-lcs (>= 1.2.0, < 2.0)
45-
rspec-support (~> 3.4.0)
46-
rspec-mocks (3.4.1)
50+
rspec-support (~> 3.5.0)
51+
rspec-mocks (3.5.0)
4752
diff-lcs (>= 1.2.0, < 2.0)
48-
rspec-support (~> 3.4.0)
49-
rspec-support (3.4.1)
53+
rspec-support (~> 3.5.0)
54+
rspec-support (3.5.0)
5055
sinatra (1.4.7)
5156
rack (~> 1.5)
5257
rack-protection (~> 1.4)
5358
tilt (>= 1.3, < 3)
54-
tilt (2.0.2)
55-
websocket-driver (0.6.3)
59+
tilt (2.0.5)
60+
unf (0.1.4)
61+
unf_ext
62+
unf_ext (0.0.7.2)
63+
websocket-driver (0.6.4)
5664
websocket-extensions (>= 0.1.0)
5765
websocket-extensions (0.1.2)
5866
xpath (2.0.0)

0 commit comments

Comments
 (0)