History

Bump Ruby 2.6.0

Thibaut Courouble committed 7 years ago

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

Unified · Split

8 files
  1. .ruby-version +1 −1
  2. Dockerfile +1 −1
  3. Dockerfile-alpine +1 −1
  4. Gemfile +1 −1
  5. Gemfile.lock +21 −22
  6. README.md +1 −1
  7. lib/docs/core/requester.rb +1 −1
  8. lib/docs/core/url.rb +1 −1
.ruby-version+1−1
@@ -1 +1 @@
12.5.312.6.0
Dockerfile+1−1
@@ -1,4 +1,4 @@
1FROM ruby:2.5.31FROM ruby:2.6.0
2 2
3ENV LANG=C.UTF-83ENV LANG=C.UTF-8
4 4
Dockerfile-alpine+1−1
@@ -1,4 +1,4 @@
1FROM ruby:2.5.3-alpine1FROM ruby:2.6.0-alpine
2 2
3ENV LANG=C.UTF-83ENV LANG=C.UTF-8
4 4
Gemfile+1−1
@@ -1,5 +1,5 @@
1source 'https://rubygems.org'1source 'https://rubygems.org'
2ruby '2.5.3'2ruby '2.6.0'
3 3
4gem 'rake'4gem 'rake'
5gem 'thor'5gem 'thor'
Gemfile.lock+21−22
@@ -19,19 +19,19 @@ GEM · 18 unmodified lines
19 coffee-script-source (1.12.2)19 coffee-script-source (1.12.2)
20 concurrent-ruby (1.1.4)20 concurrent-ruby (1.1.4)
21 daemons (1.3.1)21 daemons (1.3.1)
22 erubi (1.7.1)22 erubi (1.8.0)
23 ethon (0.11.0)23 ethon (0.12.0)
24 ffi (>= 1.3.0)24 ffi (>= 1.3.0)
25 eventmachine (1.2.7)25 eventmachine (1.2.7)
26 execjs (2.7.0)26 execjs (2.7.0)
27 exifr (1.3.5)27 exifr (1.3.5)
28 ffi (1.9.25)28 ffi (1.10.0)
29 fspath (3.1.0)29 fspath (3.1.0)
30 highline (2.0.0)30 highline (2.0.0)
31 html-pipeline (2.9.1)31 html-pipeline (2.10.0)
32 activesupport (>= 2)32 activesupport (>= 2)
33 nokogiri (>= 1.4)33 nokogiri (>= 1.4)
34 i18n (1.2.0)34 i18n (1.5.2)
35 concurrent-ruby (~> 1.0)35 concurrent-ruby (~> 1.0)
36 image_optim (0.26.3)36 image_optim (0.26.3)
37 exifr (~> 1.2, >= 1.2.2)37 exifr (~> 1.2, >= 1.2.2)
@@ -39,21 +39,21 @@ GEM · 1 unmodified line
39 image_size (>= 1.5, < 3)39 image_size (>= 1.5, < 3)
40 in_threads (~> 1.3)40 in_threads (~> 1.3)
41 progress (~> 3.0, >= 3.0.1)41 progress (~> 3.0, >= 3.0.1)
42 image_optim_pack (0.5.1.20181213)42 image_optim_pack (0.5.1.20190105)
43 fspath (>= 2.1, < 4)43 fspath (>= 2.1, < 4)
44 image_optim (~> 0.19)44 image_optim (~> 0.19)
45 image_size (2.0.0)45 image_size (2.0.0)
46 in_threads (1.5.0)46 in_threads (1.5.1)
47 method_source (0.9.2)47 method_source (0.9.2)
48 mini_portile2 (2.4.0)48 mini_portile2 (2.4.0)
49 minitest (5.11.3)49 minitest (5.11.3)
50 multi_json (1.13.1)50 multi_json (1.13.1)
51 mustermann (1.0.3)51 mustermann (1.0.3)
52 net-sftp (2.1.3.rc3)52 net-sftp (3.0.0.beta1)
53 net-ssh (>= 2.6.5, < 6.0.0)53 net-ssh (>= 5.0.0, < 6.0.0)
54 net-ssh (5.0.2)54 net-ssh (5.1.0)
55 newrelic_rpm (5.6.0.349)55 newrelic_rpm (5.7.0.350)
56 nokogiri (1.9.0)56 nokogiri (1.10.1)
57 mini_portile2 (~> 2.4.0)57 mini_portile2 (~> 2.4.0)
58 options (2.3.2)58 options (2.3.2)
59 progress (3.5.0)59 progress (3.5.0)
@@ -64,7 +64,7 @@ GEM · 4 unmodified lines
64 coderay (~> 1.1.0)64 coderay (~> 1.1.0)
65 method_source (~> 0.9.0)65 method_source (~> 0.9.0)
66 rack (2.0.6)66 rack (2.0.6)
67 rack-protection (2.0.4)67 rack-protection (2.0.5)
68 rack68 rack
69 rack-ssl-enforcer (0.2.9)69 rack-ssl-enforcer (0.2.9)
70 rack-test (1.1.0)70 rack-test (1.1.0)
@@ -74,23 +74,22 @@ GEM · 3 unmodified lines
74 rb-inotify (0.10.0)74 rb-inotify (0.10.0)
75 ffi (~> 1.0)75 ffi (~> 1.0)
76 rr (1.2.1)76 rr (1.2.1)
77 sass (3.7.2)77 sass (3.7.3)
78 sass-listen (~> 4.0.0)78 sass-listen (~> 4.0.0)
79 sass-listen (4.0.0)79 sass-listen (4.0.0)
80 rb-fsevent (~> 0.9, >= 0.9.4)80 rb-fsevent (~> 0.9, >= 0.9.4)
81 rb-inotify (~> 0.9, >= 0.9.7)81 rb-inotify (~> 0.9, >= 0.9.7)
82 sinatra (2.0.4)82 sinatra (2.0.5)
83 mustermann (~> 1.0)83 mustermann (~> 1.0)
84 rack (~> 2.0)84 rack (~> 2.0)
85 rack-protection (= 2.0.4)85 rack-protection (= 2.0.5)
86 tilt (~> 2.0)86 tilt (~> 2.0)
87 sinatra-contrib (2.0.4)87 sinatra-contrib (2.0.5)
88 activesupport (>= 4.0.0)
89 backports (>= 2.8.2)88 backports (>= 2.8.2)
90 multi_json89 multi_json
91 mustermann (~> 1.0)90 mustermann (~> 1.0)
92 rack-protection (= 2.0.4)91 rack-protection (= 2.0.5)
93 sinatra (= 2.0.4)92 sinatra (= 2.0.5)
94 tilt (>= 1.3, < 3)93 tilt (>= 1.3, < 3)
95 sprockets (3.7.2)94 sprockets (3.7.2)
96 concurrent-ruby (~> 1.0)95 concurrent-ruby (~> 1.0)
@@ -121,7 +120,7 @@ GEM · 24 unmodified lines
121 thread_safe (~> 0.1)120 thread_safe (~> 0.1)
122 uglifier (4.1.20)121 uglifier (4.1.20)
123 execjs (>= 0.3.0, < 3)122 execjs (>= 0.3.0, < 3)
124 unicode-display_width (1.4.0)123 unicode-display_width (1.4.1)
125 unicode_utils (1.4.0)124 unicode_utils (1.4.0)
126 unix_utils (0.0.15)125 unix_utils (0.0.15)
127 yajl-ruby (1.4.1)126 yajl-ruby (1.4.1)
@@ -163,7 +162,7 @@ DEPENDENCIES · 35 unmodified lines
163 yajl-ruby162 yajl-ruby
164 163
165RUBY VERSION164RUBY VERSION
166 ruby 2.5.3p105165 ruby 2.6.0p0
167 166
168BUNDLED WITH167BUNDLED WITH
169 1.17.2168 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
19DevDocs is made of two pieces: a Ruby scraper that generates the documentation and metadata, and a JavaScript app powered by a small Sinatra app.19DevDocs 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
21DevDocs 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:21DevDocs 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```
24git clone https://github.com/freeCodeCamp/devdocs.git && cd devdocs24git 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 def initialize(options = {})22 def initialize(options = {})
23 @request_options = options.extract!(:request_options)[:request_options].try(:dup) || {}23 @request_options = options.extract!(:request_options)[:request_options].try(:dup) || {}
24 options[:max_concurrency] ||= 2024 options[:max_concurrency] ||= 20
25 options[:pipelining] = false25 options[:pipelining] = 0
26 super26 super
27 end27 end
28 28
lib/docs/core/url.rb+1−1
@@ -72,7 +72,7 @@ module Docs · 71 unmodified lines
72 72
73 if base == dest73 if base == dest
74 ''74 ''
75 elsif dest.start_with? File.join(base, '')75 elsif dest.start_with?(::File.join(base, ''))
76 url.path[(path.length)..-1]76 url.path[(path.length)..-1]
77 end77 end
78 end78 end