Skip to content

Commit 9447025

Browse files
ThibautThibaut
committed
Bump Ruby 2.4.0
1 parent a5a999d commit 9447025

7 files changed

Lines changed: 32 additions & 31 deletions

File tree

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.3
1+
2.4.0

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
FROM ruby:2.3.3
2+
FROM ruby:2.4.0
33
MAINTAINER Conor Heine <[email protected]>
44

55
RUN apt-get update

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
source 'https://rubygems.org'
2-
ruby '2.3.3'
2+
ruby '2.4.0'
33

44
gem 'rake'
55
gem 'thor'
66
gem 'pry', '~> 0.10.0'
7-
gem 'activesupport', '~> 4.2', require: false
7+
gem 'activesupport', '~> 5.0', require: false
88
gem 'yajl-ruby', require: false
99

1010
group :app do

‎Gemfile.lock‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.7.1)
4+
activesupport (5.0.1)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
56
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
98
tzinfo (~> 1.1)
109
backports (3.6.8)
1110
better_errors (2.1.1)
@@ -17,26 +16,25 @@ GEM
1716
coffee-script (2.4.1)
1817
coffee-script-source
1918
execjs
20-
coffee-script-source (1.11.1)
21-
concurrent-ruby (1.0.2)
19+
coffee-script-source (1.12.2)
20+
concurrent-ruby (1.0.4)
2221
daemons (1.2.4)
2322
erubis (2.7.0)
24-
ethon (0.9.1)
23+
ethon (0.10.1)
2524
ffi (>= 1.3.0)
2625
eventmachine (1.2.1)
2726
execjs (2.7.0)
28-
ffi (1.9.14)
27+
ffi (1.9.17)
2928
highline (1.7.8)
30-
html-pipeline (2.4.2)
29+
html-pipeline (2.5.0)
3130
activesupport (>= 2)
3231
nokogiri (>= 1.4)
3332
i18n (0.7.0)
34-
json (1.8.3)
3533
method_source (0.8.2)
3634
mini_portile2 (2.1.0)
37-
minitest (5.9.1)
35+
minitest (5.10.1)
3836
multi_json (1.12.1)
39-
nokogiri (1.6.8.1)
37+
nokogiri (1.7.0.1)
4038
mini_portile2 (~> 2.1.0)
4139
options (2.3.2)
4240
progress_bar (1.1.0)
@@ -51,9 +49,9 @@ GEM
5149
rack
5250
rack-test (0.6.3)
5351
rack (>= 1.0)
54-
rake (11.3.0)
52+
rake (12.0.0)
5553
rr (1.2.0)
56-
sass (3.4.22)
54+
sass (3.4.23)
5755
sinatra (1.4.7)
5856
rack (~> 1.5)
5957
rack-protection (~> 1.4)
@@ -66,7 +64,7 @@ GEM
6664
sinatra (~> 1.4.0)
6765
tilt (>= 1.3, < 3)
6866
slop (3.6.0)
69-
sprockets (3.7.0)
67+
sprockets (3.7.1)
7068
concurrent-ruby (~> 1.0)
7169
rack (> 1, < 3)
7270
sprockets-helpers (1.2.1)
@@ -75,32 +73,34 @@ GEM
7573
daemons (~> 1.0, >= 1.0.9)
7674
eventmachine (~> 1.0, >= 1.0.4)
7775
rack (>= 1, < 3)
78-
thor (0.19.3)
76+
thor (0.19.4)
7977
thread_safe (0.3.5)
8078
tilt (2.0.5)
81-
tty-pager (0.4.0)
79+
tty-pager (0.5.0)
8280
tty-screen (~> 0.5.0)
83-
tty-which (~> 0.1.0)
84-
verse (~> 0.4.0)
81+
tty-which (~> 0.2.0)
82+
verse (~> 0.5.0)
8583
tty-screen (0.5.0)
86-
tty-which (0.1.0)
87-
typhoeus (1.1.0)
84+
tty-which (0.2.1)
85+
typhoeus (1.1.2)
8886
ethon (>= 0.9.0)
8987
tzinfo (1.2.2)
9088
thread_safe (~> 0.1)
91-
uglifier (3.0.3)
89+
uglifier (3.0.4)
9290
execjs (>= 0.3.0, < 3)
91+
unicode-display_width (1.1.3)
9392
unicode_utils (1.4.0)
9493
unix_utils (0.0.15)
95-
verse (0.4.0)
94+
verse (0.5.0)
95+
unicode-display_width (~> 1.1.0)
9696
unicode_utils (~> 1.4.0)
9797
yajl-ruby (1.3.0)
9898

9999
PLATFORMS
100100
ruby
101101

102102
DEPENDENCIES
103-
activesupport (~> 4.2)
103+
activesupport (~> 5.0)
104104
better_errors
105105
browser
106106
coffee-script
@@ -128,7 +128,7 @@ DEPENDENCIES
128128
yajl-ruby
129129

130130
RUBY VERSION
131-
ruby 2.3.3p222
131+
ruby 2.4.0p0
132132

133133
BUNDLED WITH
134-
1.13.6
134+
1.14.1

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Unless you wish to contribute to the project, I recommend using the hosted versi
2020

2121
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.
2222

23-
DevDocs requires Ruby 2.3.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:
23+
DevDocs requires Ruby 2.4.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:
2424

2525
```
2626
git clone https://github.com/Thibaut/devdocs.git && cd devdocs

‎lib/app.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ class App < Sinatra::Application
77
Bundler.require environment
88
require 'sinatra/cookies'
99
require 'tilt/erubis'
10+
require 'active_support/notifications'
1011

1112
Rack::Mime::MIME_TYPES['.webapp'] = 'application/x-web-app-manifest+json'
1213

‎test/lib/docs/core/url_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ class DocsUrlTest < MiniTest::Spec
197197
end
198198

199199
it "returns nil with 'http://example.com'" do
200-
assert_equal nil, url.subpath_to('http://example.com')
200+
assert_nil url.subpath_to('http://example.com')
201201
end
202202
end
203203

0 commit comments

Comments
 (0)