Bump Ruby 2.6.0

Thibaut Courouble committed 7 years ago

Commit 2eb86541 parent 90ddbad8 files · +28 −29Browse files

Unified · Split

8 files

.ruby-version +1 −1
Dockerfile +1 −1
Dockerfile-alpine +1 −1
Gemfile +1 −1
Gemfile.lock +21 −22
README.md +1 −1
lib/docs/core/requester.rb +1 −1
lib/docs/core/url.rb +1 −1

@@ -1 +1 @@
1		−2.5.3
	1	+2.6.0

Dockerfile+1−1

@@ -1,4 +1,4 @@
1		−FROM ruby:2.5.3
	1	+FROM ruby:2.6.0
2	2
3	3	ENV LANG=C.UTF-8
4	4

Dockerfile-alpine+1−1

@@ -1,4 +1,4 @@
1		−FROM ruby:2.5.3-alpine
	1	+FROM ruby:2.6.0-alpine
2	2
3	3	ENV LANG=C.UTF-8
4	4

Gemfile+1−1

@@ -1,5 +1,5 @@
1	1	source 'https://rubygems.org'
2		−ruby '2.5.3'
	2	+ruby '2.6.0'
3	3
4	4	gem 'rake'
5	5	gem 'thor'

Gemfile.lock+21−22

@@ -19,19 +19,19 @@ GEM · 18 unmodified lines
19	19	coffee-script-source (1.12.2)
20	20	concurrent-ruby (1.1.4)
21	21	daemons (1.3.1)
22		− erubi (1.7.1)
23		− ethon (0.11.0)
	22	+ erubi (1.8.0)
	23	+ ethon (0.12.0)
24	24	ffi (>= 1.3.0)
25	25	eventmachine (1.2.7)
26	26	execjs (2.7.0)
27	27	exifr (1.3.5)
28		− ffi (1.9.25)
	28	+ ffi (1.10.0)
29	29	fspath (3.1.0)
30	30	highline (2.0.0)
31		− html-pipeline (2.9.1)
	31	+ html-pipeline (2.10.0)
32	32	activesupport (>= 2)
33	33	nokogiri (>= 1.4)
34		− i18n (1.2.0)
	34	+ i18n (1.5.2)
35	35	concurrent-ruby (~> 1.0)
36	36	image_optim (0.26.3)
37	37	exifr (~> 1.2, >= 1.2.2)
@@ -39,21 +39,21 @@ GEM · 1 unmodified line
39	39	image_size (>= 1.5, < 3)
40	40	in_threads (~> 1.3)
41	41	progress (~> 3.0, >= 3.0.1)
42		− image_optim_pack (0.5.1.20181213)
	42	+ image_optim_pack (0.5.1.20190105)
43	43	fspath (>= 2.1, < 4)
44	44	image_optim (~> 0.19)
45	45	image_size (2.0.0)
46		− in_threads (1.5.0)
	46	+ in_threads (1.5.1)
47	47	method_source (0.9.2)
48	48	mini_portile2 (2.4.0)
49	49	minitest (5.11.3)
50	50	multi_json (1.13.1)
51	51	mustermann (1.0.3)
52		− net-sftp (2.1.3.rc3)
53		− net-ssh (>= 2.6.5, < 6.0.0)
54		− net-ssh (5.0.2)
55		− newrelic_rpm (5.6.0.349)
56		− nokogiri (1.9.0)
	52	+ net-sftp (3.0.0.beta1)
	53	+ net-ssh (>= 5.0.0, < 6.0.0)
	54	+ net-ssh (5.1.0)
	55	+ newrelic_rpm (5.7.0.350)
	56	+ nokogiri (1.10.1)
57	57	mini_portile2 (~> 2.4.0)
58	58	options (2.3.2)
59	59	progress (3.5.0)
@@ -64,7 +64,7 @@ GEM · 4 unmodified lines
64	64	coderay (~> 1.1.0)
65	65	method_source (~> 0.9.0)
66	66	rack (2.0.6)
67		− rack-protection (2.0.4)
	67	+ rack-protection (2.0.5)
68	68	rack
69	69	rack-ssl-enforcer (0.2.9)
70	70	rack-test (1.1.0)
@@ -74,23 +74,22 @@ GEM · 3 unmodified lines
74	74	rb-inotify (0.10.0)
75	75	ffi (~> 1.0)
76	76	rr (1.2.1)
77		− sass (3.7.2)
	77	+ sass (3.7.3)
78	78	sass-listen (~> 4.0.0)
79	79	sass-listen (4.0.0)
80	80	rb-fsevent (~> 0.9, >= 0.9.4)
81	81	rb-inotify (~> 0.9, >= 0.9.7)
82		− sinatra (2.0.4)
	82	+ sinatra (2.0.5)
83	83	mustermann (~> 1.0)
84	84	rack (~> 2.0)
85		− rack-protection (= 2.0.4)
	85	+ rack-protection (= 2.0.5)
86	86	tilt (~> 2.0)
87		− sinatra-contrib (2.0.4)
88		− activesupport (>= 4.0.0)
	87	+ sinatra-contrib (2.0.5)
89	88	backports (>= 2.8.2)
90	89	multi_json
91	90	mustermann (~> 1.0)
92		− rack-protection (= 2.0.4)
93		− sinatra (= 2.0.4)
	91	+ rack-protection (= 2.0.5)
	92	+ sinatra (= 2.0.5)
94	93	tilt (>= 1.3, < 3)
95	94	sprockets (3.7.2)
96	95	concurrent-ruby (~> 1.0)
@@ -121,7 +120,7 @@ GEM · 24 unmodified lines
121	120	thread_safe (~> 0.1)
122	121	uglifier (4.1.20)
123	122	execjs (>= 0.3.0, < 3)
124		− unicode-display_width (1.4.0)
	123	+ unicode-display_width (1.4.1)
125	124	unicode_utils (1.4.0)
126	125	unix_utils (0.0.15)
127	126	yajl-ruby (1.4.1)
@@ -163,7 +162,7 @@ DEPENDENCIES · 35 unmodified lines
163	162	yajl-ruby
164	163
165	164	RUBY VERSION
166		− ruby 2.5.3p105
	165	+ ruby 2.6.0p0
167	166
168	167	BUNDLED WITH
169	168	1.17.2

README.md+1−1

@@ -18,7 +18,7 @@ Unless you wish to contribute to the project, we recommend using the hosted vers · 17 unmodified lines
18	18
19	19	DevDocs is made of two pieces: a Ruby scraper that generates the documentation and metadata, and a JavaScript app powered by a small Sinatra app.
20	20
21		−DevDocs requires Ruby 2.5.3, libcurl, and a JavaScript runtime supported by [ExecJS](https://github.com/rails/execjs#readme) (included in OS X and Windows; [Node.js](https://nodejs.org/en/) on Linux). Once you have these installed, run the following commands:
	21	+DevDocs requires Ruby 2.6.0, libcurl, and a JavaScript runtime supported by [ExecJS](https://github.com/rails/execjs#readme) (included in OS X and Windows; [Node.js](https://nodejs.org/en/) on Linux). Once you have these installed, run the following commands:
22	22
23	23	```
24	24	git clone https://github.com/freeCodeCamp/devdocs.git && cd devdocs

lib/docs/core/requester.rb+1−1

@@ -22,7 +22,7 @@ module Docs · 21 unmodified lines
22	22	def initialize(options = {})
23	23	@request_options = options.extract!(:request_options)[:request_options].try(:dup) \|\| {}
24	24	options[:max_concurrency] \|\|= 20
25		− options[:pipelining] = false
	25	+ options[:pipelining] = 0
26	26	super
27	27	end
28	28

lib/docs/core/url.rb+1−1

@@ -72,7 +72,7 @@ module Docs · 71 unmodified lines
72	72
73	73	if base == dest
74	74	''
75		− elsif dest.start_with? File.join(base, '')
	75	+ elsif dest.start_with?(::File.join(base, ''))
76	76	url.path[(path.length)..-1]
77	77	end
78	78	end