8000 Merge pull request #817 from github/update-1436559952 · Ratts704/developer.github.com@280abaa · GitHub
[go: up one dir, main page]
Skip to content

Commit 280abaa

Browse files
hubothubot
committed
Merge pull request github#817 from github/update-1436559952
2 parents df092c9 + 8cb7499 commit 280abaa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+18
-15
lines changed

‎.gitignore‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
# File generated by script/bootstrap
2+
/.bundle/
3+
/bin
4+
/vendor/ruby
5+
/vendor/gems/
6+
/vendor/cache/ruby/
7+
18
output
29
tmp
310
.DS_Store
411
.bundle
5-
bin
612
crash.log
7-
/vendor/gems/
8-
/bin/
9-
/.bundle/
1013
static/search-index.json

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.9.3
1+
2.1.6

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
language: ruby
22
rvm:
3-
- 1.9.3
3+
- 2.1.6

‎Gemfile‎

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

3-
ruby '1.9.3'
3+
ruby '2.1.6'
44

55
gem 'builder'
66
gem 'coderay'

‎Rakefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ end
1111
desc "Test the output"
1212
task :test => [:clean, :remove_output_dir, :compile] do
1313
require 'html/proofer'
14-
HTML::Proofer.new("./output").run
14+
ignored_links = [%r{www.w3.org}]
15+
HTML::Proofer.new("./output", :href_ignore => ignored_links).run
1516
end
1617

1718
desc "Remove the output dir"

‎content/guides/getting-started.md‎

Lines changed: 1 addition & 1 deletion

‎content/v3.md‎

Lines changed: 1 addition & 1 deletion

‎script/bootstrap‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ export CC=gcc
66
command -v bundle >/dev/null 2>&1 || { echo >&2 "Bundler required but not found: gem install bundler"; exit 1; }
77

88
echo "==> Installing gem dependencies…"
9-
bundle check --path vendor/gems 2>&1 > /dev/null || {
10-
bundle install --binstubs bin --path vendor/gems --quiet
11-
}
9+
10+
bundle install --local --binstubs --path vendor/cache "$@"

‎script/cibuild‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66

77
# GC customizations
88
export RUBY_GC_MALLOC_LIMIT=79000000
9-
export RUBY_HEAP_MIN_SLOTS=800000
9+
export RUBY_GC_HEAP_INIT_SLOTS=800000
1010
export RUBY_HEAP_FREE_MIN=100000
1111
export RUBY_HEAP_SLOTS_INCREMENT=400000
1212
export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
@@ -15,7 +15,7 @@ export PATH="/usr/share/rbenv/shims:$PATH"
1515
export RACK_ROOT=$(cd "$(dirname $0)"/.. && pwd)
1616
export RACK_ENV="test"
1717
export RAILS_ENV="test"
18-
export RBENV_VERSION="1.9.3-p194"
18+
export RBENV_VERSION="2.1.6-github"
1919

2020
# clean out the ruby environment
2121
export RUBYLIB=

‎vendor/cache/adsf-1.2.0.gem‎

8 KB
Binary file not shown.

0 commit comments

Comments
 (0)
0