Skip to content
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Commit 2111e18

Browse files
gjtorikiangjtorikian
committed
Merge from upstream
1 parent 2524063 commit 2111e18

Some content is hidden

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

63 files changed

+142
-27
lines changed

‎Gemfile‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
source 'http://rubygems.org'
2-
32
ruby '2.2.3'
43

54
gem 'builder'
6-
gem 'kramdown', '~> 0.13.2'
5+
gem 'kramdown', '~> 1.8'
76
gem 'nanoc', '~> 4.0'
87
gem 'nokogiri', '~> 1.6.0'
98
gem 'rouge', '~> 1.4'
10-
gem 'rake', '~> 0.9.2'
119

1210
group :development do
11+
gem 'rake', '10.3.2'
1312
gem 'adsf'
1413
gem 'fssm'
1514
gem 'guard-nanoc'
1615
end
1716

17+
group :staging do
18+
gem 'jekyll-auth', '~> 2.0'
19+
end
20+
1821
group :test do
1922
gem 'html-proofer', '~> 2.5'
2023
end

‎Gemfile.lock‎

Lines changed: 96 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,141 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4+
activesupport (4.2.5)
5+
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
410
addressable (2.3.8)
511
adsf (1.2.0)
612
rack (>= 1.0.0)
713
builder (3.2.2)
8-
celluloid (0.15.2)
9-
timers (~> 1.1.0)
1014
coderay (1.1.0)
15+
colorator (0.1)
1116
colored (1.2)
1217
cri (2.7.0)
1318
colored (~> 1.2)
14-
ethon (0.7.4)
19+
dotenv (2.0.2)
20+
ethon (0.8.0)
1521
ffi (>= 1.3.0)
22+
faraday (0.9.2)
23+
multipart-post (>= 1.2, < 3)
1624
ffi (1.9.10)
1725
formatador (0.2.5)
1826
fssm (0.2.10)
19-
guard (2.6.1)
27+
guard (2.13.0)
2028
formatador (>= 0.2.4)
21-
listen (~> 2.7)
29+
listen (>= 2.7, <= 4.0)
2230
lumberjack (~> 1.0)
31+
nenv (~> 0.1)
32+
notiffany (~> 0.0)
2333
pry (>= 0.9.12)
34+
shellany (~> 0.0)
2435
thor (>= 0.18.1)
25-
guard-nanoc (1.0.2)
26-
guard (>= 1.8.0)
27-
nanoc (>= 3.6.3)
28-
html-proofer (2.5.1)
36+
guard-compat (1.2.1)
37+
guard-nanoc (2.0.0)
38+
guard (~> 2.8)
39+
guard-compat (~> 1.0)
40+
nanoc (~> 4.0)
41+
html-proofer (2.5.2)
2942
addressable (~> 2.3)
3043
colored (~> 1.2)
3144
mercenary (~> 0.3.2)
3245
nokogiri (~> 1.5)
3346
parallel (~> 1.3)
3447
typhoeus (~> 0.7)
3548
yell (~> 2.0)
36-
kramdown (0.13.8)
37-
listen (2.7.9)
38-
celluloid (>= 0.15.2)
49+
i18n (0.7.0)
50+
jekyll (3.0.0)
51+
colorator (~> 0.1)
52+
jekyll-sass-converter (~> 1.0)
53+
jekyll-watch (~> 1.1)
54+
kramdown (~> 1.3)
55+
liquid (~> 3.0)
56+
mercenary (~> 0.3.3)
57+
rouge (~> 1.7)
58+
safe_yaml (~> 1.0)
59+
jekyll-auth (2.0.0)
60+
colorator (~> 0.1)
61+
dotenv (~> 2.0)
62+
jekyll (>= 2.0)
63+
mercenary (~> 0.3)
64+
rack (~> 1.6)
65+
rack-ssl-enforcer (~> 0.2)
66+
rake (~> 10.3)
67+
safe_yaml (~> 1.0)
68+
sinatra-index (~> 0.0)
69+
sinatra_auth_github (~> 1.1)
70+
jekyll-sass-converter (1.3.0)
71+
sass (~> 3.2)
72+
jekyll-watch (1.3.0)
73+
listen (~> 3.0)
74+
json (1.8.3)
75+
kramdown (1.9.0)
76+
liquid (3.0.6)
77+
listen (3.0.4)
3978
rb-fsevent (>= 0.9.3)
4079
rb-inotify (>= 0.9)
4180
lumberjack (1.0.9)
4281
mercenary (0.3.5)
4382
method_source (0.8.2)
4483
mini_portile (0.6.2)
84+
minitest (5.8.2)
85+
multipart-post (2.0.0)
4586
nanoc (4.0.0)
4687
cri (~> 2.3)
88+
nenv (0.2.0)
4789
nokogiri (1.6.6.2)
4890
mini_portile (~> 0.6.0)
91+
notiffany (0.0.8)
92+
nenv (~> 0.1)
93+
shellany (~> 0.0)
94+
octokit (4.1.1)
95+
sawyer (~> 0.6.0, >= 0.5.3)
4996
parallel (1.6.1)
50-
pry (0.10.0)
97+
pry (0.10.3)
5198
coderay (~> 1.1.0)
5299
method_source (~> 0.8.1)
53100
slop (~> 3.4)
54101
rack (1.6.4)
55-
rake (0.9.6)
56-
rb-fsevent (0.9.4)
102+
rack-protection (1.5.3)
103+
rack
104+
rack-ssl-enforcer (0.2.9)
105+
rake (10.3.2)
106+
rb-fsevent (0.9.6)
57107
rb-inotify (0.9.5)
58108
ffi (>= 0.5.0)
59-
rouge (1.4.0)
109+
rouge (1.10.1)
110+
safe_yaml (1.0.4)
111+
sass (3.4.19)
112+
sawyer (0.6.0)
113+
addressable (~> 2.3.5)
114+
faraday (~> 0.8, < 0.10)
115+
shellany (0.0.1)
116+
sinatra (1.4.6)
117+
rack (~> 1.4)
118+
rack-protection (~> 1.4)
119+
tilt (>= 1.3, < 3)
120+
sinatra-index (0.0.2)
121+
sinatra
122+
sinatra_auth_github (1.2.0)
123+
sinatra (~> 1.0)
124+
warden-github (~> 1.2.0)
60125
slop (3.6.0)
61126
thor (0.19.1)
62-
timers (1.1.0)
63-
typhoeus (0.7.3)
64-
ethon (>= 0.7.4)
127+
thread_safe (0.3.5)
128+
tilt (2.0.1)
129+
typhoeus (0.8.0)
130+
ethon (>= 0.8.0)
131+
tzinfo (1.2.2)
132+
thread_safe (~> 0.1)
133+
warden (1.2.3)
134+
rack (>= 1.0)
135+
warden-github (1.2.0)
136+
activesupport (> 3.0)
137+
octokit (> 2.1.0)
138+
warden (> 1.0)
65139
yell (2.0.5)
66140

67141
PLATFORMS
@@ -73,10 +147,11 @@ DEPENDENCIES
73147
fssm
74148
guard-nanoc
75149
html-proofer (~> 2.5)
76-
kramdown (~> 0.13.2)
150+
jekyll-auth (~> 2.0)
151+
kramdown (~> 1.8)
77152
nanoc (~> 4.0)
78153
nokogiri (~> 1.6.0)
79-
rake (~> 0.9.2)
154+
rake (= 10.3.2)
80155
rouge (~> 1.4)
81156

82157
BUNDLED WITH

‎Rakefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ def commit_message(no_commit_msg = false)
6060
mesg.gsub(/'/, '') # Allow this to be handed off via -m '#{message}'
6161
end
6262

63+
namespace :assets do
64+
task :precompile => [:compile] do
65+
sh 'mv output _site/'
66+
end
67+
end
68+
6369
desc "Publish to http://developer.github.com"
6470
task :publish, [:no_commit_msg] => [:remove_tmp_dir, :remove_output_dir, :build] do |t, args|
6571
message = commit_message(args[:no_commit_msg])

‎assets/stylesheets/documentation.css‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,6 +1267,19 @@ pre span.comment {color: #aaa;}
12671267
color: #63E463;
12681268
}
12691269

1270+
#staging-header {
1271+
line-height: 34px;
1272+
color: rgba(255, 255, 255, 0.5);
1273+
background-color: #222;
1274+
}
1275+
1276+
#staging-header p {
1277+
color: white;
1278+
font-size: 12px;
1279+
padding-left: 20px;
1280+
margin: 0;
1281+
}
1282+
12701283
/****************************/
12711284
/* Expandable List Module */
12721285
/****************************/

‎config.ru‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# This file is auto-generated by Jekyll Auth
2+
# It tells Heroku how to launch our site
3+
4+
require "jekyll-auth"
5+
run JekyllAuth.site

‎layouts/header.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<%= render '/includes/staging_header.html' %>
12
<div id="header-wrapper">
23
<div id="header">
34
<div>

‎layouts/includes/staging_header.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<% if ENV['RACK_ENV'] == 'staging' %>
2+
<div id="staging-header">
3+
<p>You're looking at <a href="https://github.com/github/internal-developer.github.com/commit/<%= ENV['SOURCE_VERSION'] %>"><%= ENV['SOURCE_VERSION'] %></a>
4+
</div>
5+
<% end %>

‎script/bootstrap‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@ 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/cache 2>&1 || {
10-
bundle install --path vendor/cache
11-
}
9+
10+
if [ "$RACK_ENV" = "production" ]; then
11+
export NOKOGIRI_USE_SYSTEM_LIBRARIES=1
12+
bundle install --without development staging test benchmark --path vendor/cache --jobs 4 --local --deployment
13+
else
14+
bundle check --path vendor/cache 2>&1 || {
15+
bundle install --path vendor/cache
16+
}
17+
fi
1218

1319
echo "==> Installing npm dependencies…"
20+
1421
if [ "$RACK_ENV" = "production" ]; then
1522
npm install --production
1623
else

‎vendor/cache/activesupport-4.2.5.gem‎

323 KB
Binary file not shown.

‎vendor/cache/celluloid-0.15.2.gem‎

-45.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)