Merge pull request git#458 from git/progit2

Things needed for Pro Git 2
DMDZYP · Oct 29, 2014 · 5aad22d · 5aad22d
2 parents 6379ec9 + 9997d9c
commit 5aad22d
Show file tree

Hide file tree

Showing 379 changed files with 21,751 additions and 1,793 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,5 @@ config/database.yml
 #Ignore vim swpfiles
 *.swp
 *.swo
+
+/public/*.zip
diff --git a/Gemfile b/Gemfile
@@ -26,6 +26,7 @@ gem 'launchy'
 gem 'rubyzip'
 gem 'diff-lcs'
 gem 'redcarpet'
+gem 'nokogiri'
 
 # Assets
 gem 'compass-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -108,11 +108,14 @@ GEM
       treetop (~> 1.4.8)
     memcachier (0.0.2)
     mime-types (1.25.1)
+    mini_portile (0.6.0)
     minitest (5.4.0)
     multi_json (1.10.1)
     multipart-post (2.0.0)
     netrc (0.7.7)
     newrelic_rpm (3.9.0.229)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
     octokit (3.2.0)
       sawyer (~> 0.5.3)
     pg (0.17.1)
@@ -258,6 +261,7 @@ DEPENDENCIES
   memcachier
   netrc
   newrelic_rpm
+  nokogiri
   octokit
   pg
   rack-timeout

diff --git a/TODO.txt b/TODO.txt
@@ -1,3 +1,10 @@
+PG2:
+
+ * link for translation sources
+ * show that newer content is available for missed slugs (fallback to v1)
+
+
+
 3.1 Launch:
 
 * add MIT/CC license link to footer
@@ -63,4 +70,3 @@ Maybes:
   - technical docs
   - jgit and co
   - libgit2 and wrappers
-
diff --git a/app/assets/stylesheets/book.css.scss b/app/assets/stylesheets/book.css.scss
@@ -1,3 +1,7 @@
+.ebooks img {
+  padding: 5px;
+}
+
 #book-container {
   position: relative;
   @extend .callout;
@@ -207,3 +211,5 @@ ol.book-toc {
     }
   }
 }
+
+.switch a { color: #aaa; }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,3 +28,5 @@ config/database.yml @@
     #Ignore vim swpfiles
     *.swp
     *.swo
+    /public/*.zip