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

1361 Коммитов

Автор SHA1 Сообщение Дата
Jeff King 610ab88e01 Merge pull request #1033 from fzeeb/issue#377
Fix issue #377 - Inconsistent OS listings on Downloads page
2017-10-08 09:20:43 -04:00
Felix Zeeb 60411a8452 Drop the Solaris icon png and css rules 2017-10-08 14:52:08 +02:00
Jeff King 80d95b6d61 Merge pull request #1035 from git/merge_diff_tools
Generate mergetools-diff.txt and mergetools-merge.txt
2017-10-08 05:48:53 -04:00
Jeff King 6f8be56bb0 downloads: reword the ubuntu ppa note
I wanted to get rid of "from the developers" here, because
the PPA isn't package by Git developers. It's done by
third-party Ubuntu folks. I have no reason to think they
won't do a good job of keeping up to date, but I think it
makes sense to keep it clear that it's a third party.
2017-10-08 05:36:54 -04:00
dragon788 a78b4be909 Clarify wording around stability of packages 2017-10-07 22:45:17 -05:00
Jean-Noel Avila 386f2eb8c7 Generate mergetools-diff.txt and mergetools-merge.txt
This files are normally generated by the Makefile for
documentation. For building the manpages for the site, the logic is
quite similar but implemented in ruby.
2017-10-07 23:30:30 +02:00
Andrew Hayward f23f289b86 Adding a `banner` helper
This allows for consistent banner messaging across the site,
with the option to dismiss and reappear after a given duration.
2017-10-07 14:58:41 -04:00
Jeff King cde738ed28 Merge pull request #1027 from git/factorize_index
[RFC] Factorize the index rake task
2017-10-07 14:07:18 -04:00
Jean-Noel Avila 47055d3ea9 Migrate preindex and local_index tasks to unified logic
The unified logic is the only remaining one.
2017-10-07 18:44:39 +02:00
Pedro Rijo cdb24f4e32 Merge pull request #782 from zigarn/ungit
Add ungit GUI
2017-10-07 14:32:08 +01:00
dragon788 4785bf10c0 Add PPA instructions for Ubuntu
Since Debian and Ubuntu "stable" or LTS releases are typically far behind the Git team supported releases.
2017-10-06 13:08:45 -05:00
Felix Zeeb bc90c82c0a Fix issue #377 - Inconsistent OS listings on Downloads page
Removed link to Solaris
Changed "Linux" to "Linux/Unix"
2017-10-06 16:40:49 +02:00
Jeff King ebe2c3fa29 Merge pull request #1029 from FabriceSalvaire/master
Added CodeReview GUI client
2017-10-06 02:53:36 -04:00
Jean-Noel Avila ed20b8d595 Fix the includes in man pages
* the tag_list is the full recursive tree. It is filtered afterwards for
   some interesting files.
 * the doc_list is the filtered list of main subject files.
2017-10-05 22:13:39 +02:00
Fabrice Salvaire a26ef6dd8f fix 2017-10-05 14:18:15 +02:00
Fabrice Salvaire 00c9b30d3d Added CodeReview GUI client 2017-10-05 14:17:44 +02:00
Alexandre Garnier c7dfed9c3e Add ungit GUI 2017-10-05 10:40:38 +02:00
Jeff King 436c89f500 Merge pull request #718 from hackdorte/master
Add install instructions for Slitaz
2017-10-04 23:51:16 -04:00
Jean-Noel Avila b469202b01 2 changes from the conversation
* merge filter_tags with tag_info
 * cache doc_list between calls with the same tree_sha for github
2017-10-02 23:06:05 +02:00
Jean-Noël Avila 06ce90eb0b Merge pull request #1026 from bedhanger/fix-typos
Fix typos
2017-10-01 22:04:32 +02:00
Jean-Noel Avila 97d110df35 Factorize the index rake task
The index task is in charge of gathering the documentation from the
git project and injecting it into database. Until now there was two
distinct files for retrieving the git project, one, `index.rake` which
allowed to get the files'content from github, and another one,
`local_index.rake` which allowed to get the content from a git
repository on the local disk. Both share the same logic in building
the pages and only differ on how to access them.

The purpose of this commit is too reunit the common logic. From now
on, only one logic of page building is provided.
2017-10-01 20:47:38 +02:00
bedhanger f63005e56a Correct spelling: use 'its' when expressing ownership
Signed-off-by: bedhanger <bedhanger@gmx.de>
2017-10-01 20:18:51 +02:00
bedhanger 0d9fef4cf2 2010-03-17-replace.markdown: correct spelling: 'seperate' -> 'separate'
Signed-off-by: bedhanger <bedhanger@gmx.de>
2017-10-01 20:09:01 +02:00
bedhanger e924276c14 elasticsearch.rb: correct spelling: 'comma seperated' -> 'comma-separated'
Signed-off-by: bedhanger <bedhanger@gmx.de>
2017-10-01 20:08:02 +02:00
Jean-Noël Avila 0ea6582dad Merge pull request #1025 from jnavila/add_git_technical_doc
manpages: Add the technical pages to generation
2017-09-30 18:34:58 +02:00
Jeff King dc3619d1dc tasks/local_index: set asciidoctor `doctype` to `book`
This matches the change done to the preindex task in
5f7ca46e95. This shouldn't
affect most documents we build, since asciidoctor assumes
them to be manpages based on their content. But it does shut
up a bunch of "section 0" warnings when building
user-manual.txt.

I can't detect any visual change to the results, so this is
at least (hopefully) not regressing anything.
2017-09-30 01:26:26 -04:00
Jeff King de8e8fbb44 tasks/index: fix link:technical regex
The "\1" and "\2" here are regex replacements, but the
double-quotes mean they get interpolated to the literal
bytes "1" and "2". We could fix this with "\\1", but it's
simpler still to just use a single-quoted string.

We can also get rid of the backslash-escaping of the
brackets. They're not needed on the replacement side of the
regex (and in fact we must get rid of them to not have them
show in the non-interpolated string).
2017-09-30 00:49:27 -04:00
Jeff King 9eb84b3347 tasks/local_index: build technical pages
This matches the recent change to preindex; otherwise our
fixed-up links go nowhere.

Note that in addition to tweaking the regex, we have to do a
few things to handle the subdirectory:

 - we need to tell `ls-tree` to recurse now (the preindex
   reads from octokit, which recurses by default)

 - we need to shrink the path to its basename to match
   preindex's flat view
2017-09-30 00:48:18 -04:00
Jeff King 08839abd71 tasks/index: reformat doc regex
The giant list of alternation is hard to read. Let's break
it into one item per line by using the `/x` regex option.
2017-09-30 00:35:54 -04:00
Jean-Noel Avila 5f7ca46e95 manpages: Add the technical pages to generation
The technical subdirectory is added to the list of processed
files. But the relative paths can not be processed correctly because
the route matching in the webserver doesn't expect subdirectories. So
we set everything at the same level.
2017-09-29 19:49:46 +02:00
Jeff King cb5bac6970 Merge pull request #1024 from joernchen/master
Add information for security relevant issues
2017-09-26 11:17:46 -04:00
joernchen 9c13f48ae7 Add information for security relevant issues
Signed-off-by: joernchen <joernchen@phenoelit.de>
2017-09-26 10:11:35 +02:00
Pedro Rijo c8985376f9 Merge pull request #1022 from benabbottnz/master
Perl website redirects to https
2017-09-11 09:11:17 +01:00
Ben Abbott c4b011fa8e Perl website redirects to https 2017-09-11 16:44:47 +12:00
Samuel Lijin 1643a32064 Merge pull request #1020 from jonathanarbely/master
Update Google logo images
2017-09-05 14:01:24 -07:00
Jonathan Arbely 55cc51d5b9 Google Branding (wordmark) updated and minified 2017-09-05 19:44:05 +02:00
Jeff King 2fa2d8d1b1 Merge pull request #1014 from frantret/frantret-patch-1
link to Ry's Git tutorial's archive
2017-08-09 08:32:45 -04:00
Frantret 5cb282166e link to Ry's Git tutorial's archive
since the original went offline (thanks @pedrorijo91)
2017-08-07 18:11:54 +02:00
Pedro Rijo c1ccbaa58d Merge pull request #1008 from avar/add-community-links
Add community links
2017-06-27 19:12:06 +01:00
Ævar Arnfjörð Bjarmason 9a9c8666ee /community: advertise the new git-packagers mailing list
See
https://groups.google.com/forum/?fromgroups#!topic/git-packagers/SMikB1z6b8U
for the announcement.
2017-06-26 18:14:37 +00:00
Ævar Arnfjörð Bjarmason 16aa97edc9 /community: add a note about the #git-devel IRC channel
It's relatively low-volume, but I at least hang out there with a few
others, so definitely something to advertise.
2017-06-26 18:12:00 +00:00
Jeff King 38e6959435 Merge pull request #1007 from gitster/jc/community-mailing-list
app/views/community: clarify subscription and archive are two separate things
2017-06-23 14:55:10 -04:00
Junio C Hamano 17f1346276 app/views/community: clarify subscription and archive are two separate things
The original seounded as if it wanted to teach how to subscribe to
the public-inbox archive, which does not make much sense.  Separate
the two and then explain the benefit of subscribing a bit better by
taking suggestion made by Ævar on the mailing list (<878tkjk7m7.fsf@gmail.com>).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-23 11:39:50 -07:00
Jeff King fcaf7e4815 Merge pull request #1005 from jbialobr/jb/updated-images
GitExtensions GUI - images of the main window.
2017-06-13 06:04:25 -04:00
Jeff King 9d95038f84 Merge remote-tracking branch 'pull/794'
* pull/794:
  Root-ifying commands
2017-06-13 05:41:23 -04:00
Jeff King c6c80af2ce Merge pull request #1006 from git/heroku-redis
swap out memcachier for heroku redis
2017-06-13 05:32:27 -04:00
janusz 5814af0efd Images of the main window.
The existing images show File History window. The main window gives a better overview of GitExtensions features.
2017-06-12 14:50:50 +02:00
Jeff King 0b268e3c44 search: index the latest_version
I'm not sure which order the entries come in by default, but
using Versions.all.last seems to give 2.8.1, which is weird.
Using latest_version is clearly what we're going for.
2017-05-03 02:58:52 -04:00
Jeff King 536c572e49 point elasticsearch at $BONSAI_URL
I'm not sure why the $SEARCH_INDEX_URL variable is used. It
does provide a layer of indirection, and the existing site
has both Bonsai and Searchify set up. So maybe it was for
switching between them.

These days we're just using Bonsai, so let's point it at the
variable that is automatically set up by the Heroku add-on.
2017-05-03 02:15:48 -04:00
Jeff King 2563fa6610 preindex: turn on octokit pagination
Otherwise we only get the most recent 25 tags (less, actually,
because we then cull the -rc tags).
2017-05-03 02:00:18 -04:00