Граф коммитов

1361 Коммитов

Автор SHA1 Сообщение Дата
Jeff King 8849b2f47f run "bundle update"
Since this PR is pushing things to a new site and I'm
watching for breakages, it seems like a good time to bump
all the gem versions, too.
2017-05-03 01:13:10 -04:00
Jeff King 4529f47444 switch rails caching from memcachier to heroku-redis
We don't really care between the two, and this should keep
all of our billing at Heroku (which can then be part of a
single sponsorship).
2017-05-03 01:03:32 -04:00
Jeff King e89e6fafe0 rails: s/assets/files/ in config.serve_static_assets
The former has been deprecated, and Rails produces an
annoying warning.
2017-05-03 01:02:12 -04:00
Jeff King 25b7934df6 Merge pull request #998 from packtpartner/patch-3
Updated ext.html.erb
2017-04-27 03:30:21 -04:00
Jeff King 84375a2c2a doc/ext: fix stray whitespace
Introduced by changes in #998.
2017-04-27 03:24:48 -04:00
Packt d01d560fd5 Updated ext.html.erb
Added the new course to the left side
2017-04-27 11:43:47 +05:30
Packt e9a2583455 Updated ext.html.erb
Added a new course
2017-04-26 15:41:42 +05:30
Jeff King 05fe236296 Merge pull request #993 from git/drop-ebook-links
drop "ebooks" template from all book sidebars
2017-04-14 16:53:17 -04:00
Jeff King 27c9bf410b drop "ebooks" template from all book sidebars
We dropped this from the main book page in #983, but the
template still appears in the individual section pages. The
same rationale applies, and we should drop it everywhere.

We can also drop the templates entirely (we may bring back
the links later, but we can resurrect them at that time).
2017-04-14 16:30:15 -04:00
Jeff King dd46c6ba02 books: fix inconsistent indentation 2017-04-04 22:50:00 -04:00
Jeff King 7249a54686 Merge remote-tracking branch 'pull/991'
* pull/991:
  External Links: Added Umali book on Git
2017-04-04 22:49:26 -04:00
Jeff King 8c91947407 Merge pull request #992 from git/pro-git-ext-cover
update progit image in book list
2017-04-04 22:45:53 -04:00
Jeff King ef371f261b update progit image in book list
The book list had the cover and single author for the
original edition of Pro Git. Let's use the updated materials
(we already have the picture elsewhere in the repo).
2017-04-04 22:41:58 -04:00
Jeff King e791493b81 Merge pull request #984 from smith-kyle/popularity-ordering-books
External Links: Ordered books by popularity
2017-04-04 22:34:59 -04:00
Rick Umali f68d044268 External Links: Added Umali book on Git
This book was published by Manning in 2015, and I'm the book's author.
2017-04-04 20:59:26 -04:00
Jeff King 1981fc73dd Merge pull request #982 from jnavila/local_genbook
Local genbook
2017-03-14 15:02:14 -04:00
Jeff King 8425136095 Merge pull request #985 from git/plug-500s
books_controller: convert bogus xrefs to PageNotFound
2017-03-14 07:23:04 -04:00
Jeff King dd2bd10d27 books_controller: convert bogus xrefs to PageNotFound
If you give a bogus book link like:

  /book/en/v2/ch00/foo

or even:

  /book/en/v5/ch00/_getting_started

the app will return a 500. This should be a 404. It doesn't
_really_ matter, except that I'm trying to make sure we
aren't producing legitimate 500s, and these create a lot of
noise.
2017-03-13 16:02:06 -04:00
Jeff King 3207e6bac6 Merge pull request #983 from jnavila/remove_ebook_downloads
Remove the ebooks download sections
2017-03-11 06:44:19 -05:00
Kyle Smith dc9e40af6c External Links: Ordered books by popularity 2017-03-10 15:19:39 -07:00
Jean-Noel Avila d9ceff1cf0 remove ebooks from sidebar 2017-03-10 22:35:42 +01:00
Jean-Noel Avila 98f2271553 Remove the ebooks download sections
The books are no longer update for download in ebook formats (pdf,
epub, kindle) since Atlas was down. Let's be bold and just remove
downloads for now.
2017-03-10 22:24:49 +01:00
Jean-Noel Avila b2361001cc Update README for book generation procedure
The book procedure was still refering to the first edition of
progit. Adding also local generation.
2017-03-10 21:54:03 +01:00
Jean-Noel Avila 5f55d108fd Introduce local_genbook2
The genbook2 task can be run with the remote github access or with a
local copy of a progit2 book. For a local copy, the path to the
project must be defined in an environment variable GENPATH.
2017-03-10 21:37:19 +01:00
Jeff King 7ca7d219de Merge pull request #981 from git/fix-n+1
fix some n+1 ActiveRecord queries
2017-03-10 15:08:21 -05:00
Jeff King 0622864861 fix some n+1 queries in the book
The main one here is that every book page includes the
complete table-of-contents (for the drop-down navigation),
which means we need to know the slug for every section of
every book. That results in an extra query per-chapter.

We can fix it with "includes(:sections)" to pre-load the
sections.
2017-03-10 05:06:08 -05:00
Jeff King 3144750faf add 'bullet' gem in development mode
This helps find n+1 queries, which seem to be one of the
main causes of production slowness.
2017-03-10 05:05:41 -05:00
Jeff King 86f5d8bb70 Merge pull request #979 from smith-kyle/gui-urls
GUI Clients: Filter based on URL
2017-03-10 04:17:55 -05:00
Jeff King 6c312d0630 precompile assets
This picks up javascript changes from f8c0333 (GUI Clients:
Filter based on URL, 2017-03-09).
2017-03-10 04:15:02 -05:00
Kyle Smith f8c0333853 GUI Clients: Filter based on URL
From the homepage, clicking the link titled "<OS Name> GUIs" brings the user to /download/gui/<OS name> but the OS filter is not applied to the clients list.

This fixes that issue and also updates the URL when a filter is clicked.
2017-03-09 17:00:01 -07:00
Jeff King 74bca42a90 re-revert "drop sfc donation banner"
This reverts commit bd6178e490,
which itself was a revert of the adding of a banner. So this
takes away the banner again. Beacuse the plan was to carry
it through February, and it's now March.
2017-03-06 10:35:32 -05:00
Jeff King 1976328433 Merge pull request #975 from smith-kyle/popularity-ordering-guis
GUI Clients: Order by popularity
2017-03-06 02:41:35 -05:00
Jeff King bda3959641 precompile assets for #975 2017-03-06 02:40:10 -05:00
Jeff King dfd253e100 Merge pull request #972 from git/docs/setupDB
Add more details on database structure creation
2017-03-02 04:58:28 -05:00
Kyle Smith a8a18f13d0 GUI Clients: Ordered by popularity
Modifed CSS to list GUIs in the order that they appear on the list. Rather than:
1 3
2 4

It's now:
1 2
3 4
2017-03-01 15:55:04 -07:00
pedrorijo91 e734bbaffb
Reference existing script to setup
Replace hint to get database config file to use existing script
Existing script takes care of setup ruby dependencies and local sqlite db
2017-03-01 20:40:33 +00:00
Jeff King cd248aebc7 Merge pull request #973 from git/docs/genBook
Add instructions to access API with 2FA
2017-02-27 15:29:44 -05:00
Pedro Rijo 0891be7e49 Add instructions to access API with 2FA
Add more information on how to access the API with password for users with 2FA enabled, using Personal Access Tokens
2017-02-27 20:20:20 +00:00
Pedro Rijo 21a2e33c15 Update README.md
Add hint on how to get config/database.yml file to create DB schema
2017-02-27 16:46:51 +00:00
Jeff King 1004f6f86b update gitlab images from progit
This completes #934 by pulling in progit/progit2#729.
2017-02-24 17:43:53 -05:00
Jeff King 6e96baf9ae Merge pull request #963 from pedrorijo91/patch-2
Add more info to location of external sources
2017-02-23 04:22:46 -05:00
pedrorijo91 16cf60047a
Another iteration on github issue template 2017-02-23 09:13:53 +00:00
Jeff King 7c809fecf0 Merge pull request #965 from jnavila/book_cover_2nd_edition
Change the cover of the Progit book to the second edition
2017-02-20 20:56:59 -05:00
Jeff King 48d74e3947 Merge pull request #968 from jnavila/fix_old_book_urls
Fix old URLs to the book
2017-02-20 20:50:33 -05:00
Jean-Noel Avila ddf8faa6c4 Rework book presentation in the doc section
The book is tersely presented and a link a given to the /book section.
2017-02-20 23:10:51 +01:00
Jean-Noel Avila 8e084c734e Fix old URLs to the book
A number of URLs are accepted and rendered directly, but doing so the
relative links are broken. This affects urls such as:

 * https://git-scm.com/book/ch4-1.html
 * https://git-scm.com/book/en/ch4-1.html

This change implements the redirect and fixes #967.
2017-02-20 22:39:35 +01:00
pedrorijo91 3e07161b61
Improve issue template after pr feedback 2017-02-20 10:01:31 +00:00
Jeff King 290ee79a39 Merge pull request #966 from packtpartner/patch-2
Update ext.html.erb
2017-02-20 02:07:40 -05:00
Packt b91ca939ca Update ext.html.erb
Removed duplication of "Git: Mastering Version Control" under books
2017-02-20 09:36:24 +05:30
Jean-Noel Avila 7f7de06519 Change the cover of the Progit book to the second edition
This closes #964
2017-02-19 12:42:02 +01:00