Skip to content

Commit 67b89ab

Browse files
committed
Loosen references to 2.0.0 and 2.1.0 to just specify 2.0 or 2.1
Bump docs repo ruby to 2.1.5 from 2.1.2
1 parent c4835b0 commit 67b89ab

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
language: ruby
22
rvm:
3-
- 2.1.2
3+
- 2.1.5
44
cache: bundler

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
ruby '2.1.2'
3+
ruby '2.1.5'
44

55
gem 'activesupport'
66
gem "erector", "~> 0.10.0"

Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GEM
77
minitest (~> 5.1)
88
thread_safe (~> 0.1)
99
tzinfo (~> 1.1)
10-
bootstrap-sass (3.3.0.1)
10+
bootstrap-sass (3.3.1.0)
1111
sass (~> 3.2)
1212
celluloid (0.16.0)
1313
timers (~> 4.0.0)
@@ -37,12 +37,12 @@ GEM
3737
jquery-cdn (2.1.1)
3838
sprockets (>= 2)
3939
json (1.8.1)
40-
listen (2.7.11)
40+
listen (2.8.0)
4141
celluloid (>= 0.15.2)
4242
rb-fsevent (>= 0.9.3)
4343
rb-inotify (>= 0.9)
4444
mini_portile (0.6.1)
45-
minitest (5.4.2)
45+
minitest (5.4.3)
4646
multi_json (1.10.1)
4747
nokogiri (1.6.4.1)
4848
mini_portile (~> 0.6.0)
@@ -80,7 +80,7 @@ GEM
8080
sexp_processor (~> 4.0)
8181
ruby_parser (3.6.3)
8282
sexp_processor (~> 4.1)
83-
sass (3.4.7)
83+
sass (3.4.8)
8484
sexp_processor (4.4.4)
8585
sinatra (1.4.5)
8686
rack (~> 1.4)

sites/en/installfest/get_a_sticker.step

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ step "Have a volunteer check your tool versions" do
1616
console "ruby -v"
1717
fuzzy_result "ruby {FUZZY}1.9.3p125 (2012-02-16 revision 34643) [x86_64-darwin11.3.0]{/FUZZY}"
1818

19-
tip "Depending on your environment, your Ruby version might be **1.9.3**, **2.0.0** or **2.1.0**. As long as it's 1.9.3 or above, you're good to go."
19+
tip "Depending on your environment, your Ruby version might be **1.9.3**, **2.0** or **2.1**. As long as it's 1.9.3 or above, you're good to go."
2020

2121
console "bundle -v"
2222
fuzzy_result "Bundler version 1{FUZZY}.x.x{/FUZZY}"

sites/en/intro-to-rails/intro-to-rails.step

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ day... unless I really screwed something up. :D
3838

3939
We're going to be working with:
4040

41-
* ruby 1.9.3, 2.0.0 or 2.1.0 installed via RVM (Mac or Linux) or RailsInstaller (Mac or Windows)
41+
* ruby 1.9.3, 2.0 or 2.1 installed via RVM (Mac or Linux) or RailsInstaller (Mac or Windows)
4242
* rails 4.1.x
4343
* bundler
4444
* sqlite

0 commit comments

Comments
 (0)