summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fixing asciidoc makefile to include images." into stablev2.2.2-rc1Martin Fick2012-01-111-0/+2
|\
| * Fixing asciidoc makefile to include images.Philipp Altmann2012-01-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | With the next release of Gerrit there will be images in the documentation. With the current makefile they are not included. This patch will solve this problem and include them. With the advent of Internet Explorer 8 all major web browsers now support the data URI scheme for embedded images and this patch use this feature. Bug: issue 1231 Change-Id: I4e675ae42105f38c6ef1287621ac7d738930c82e
* | Merge "Allow loading Project Access when there is no refs/meta/config" into ↵Martin Fick2012-01-113-4/+14
|\ \ | | | | | | | | | stable
| * | Allow loading Project Access when there is no refs/meta/configShawn O. Pearce2012-01-113-4/+14
| |/ | | | | | | | | | | | | | | | | | | | | If the project does not have refs/meta/config the revision is null. Enable loading the access screen anyway with a null revision field, and on save of any edits require the branch to be new. This is already handled by MetaDataUpdate, provided that the base revision we supply is null, so make it @Nullable inside of the ChangeProjectAccess handler. Change-Id: I4417bf802e329eb7193a7cb514f7ebcd7d68f26e
* | Merge "prolog: Fix NoBlock and NoOp functions." into stableMartin Fick2012-01-111-2/+2
|\ \
| * | prolog: Fix NoBlock and NoOp functions.Johan Bjork2012-01-111-2/+2
| |/ | | | | | | | | | | | | Probably been broken since the prolog cafe introduction. The status was never updated, resulting in broken rules. Change-Id: If036577e9827be6263d7470efa2b3f466176d71f
* / Docu-Fix: Correct syntax of SQL statement for inserting approval categoryEdwin Kempin2012-01-111-1/+1
|/ | | | | Change-Id: I23a2219590fd2bd311e985d9c505d93b5276daed Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* Documentation: Introducing a quick and dirty setup tutorialFredrik Luthander2011-12-293-0/+328
| | | | | | | | The new document covers quick installation, new project and first upload. It contains lots of quoted output, with a demo style to it. Change-Id: I9404376b527368a8348da507422c3912085e63d9 Signed-off-by: Fredrik Luthander <fredrik.luthander@sonyericsson.com>
* Access control documentation: Code reviewFredrik Luthander2011-12-281-11/+17
| | | | | | | Update of the code review sections to reflect the current label. Change-Id: I6d861e894a6a1c90e1029fc2c19c23cee1c44bbe Signed-off-by: Fredrik Luthander <fredrik.luthander@sonyericsson.com>
* Access control documentation: Conversion table between 2.1 and 2.2Fredrik Luthander2011-12-281-0/+38
| | | | | | | | | | | | Since the permissions have been rewritten entirely between Gerrit release series 2.1.x and 2.2.x, a table to ease conversion from 2.1.x is added. The table tries to address the old permissions one by one except for the push tag permission which in effect needed two permissions to work properly. This should be familiar to the administrator used to the 2.1.x permission model however. Change-Id: Id5429138d1170e0881b5331123dfd3e810d3f1c9 Signed-off-by: Fredrik Luthander <fredrik.luthander@sonyericsson.com>
* Access control documentation: Reformatted textFredrik Luthander2011-12-281-5/+5
| | | | | | | A short paragraph on access control behaviour is reformatted. Change-Id: I54be9e53d3116b5d178409fbd5a49fb2b311cc00 Signed-off-by: Fredrik Luthander <fredrik.luthander@sonyericsson.com>
* Access control documentation: VerifyFredrik Luthander2011-12-281-11/+18
| | | | | | | | Updated some text in the Per project-section and edited the verified section to reflect the current label. Change-Id: I6460cb7a9e95d67730e3bc70e79779e27bdf815f Signed-off-by: Fredrik Luthander <fredrik.luthander@sonyericsson.com>
* Access control documentation: capabilitiesFredrik Luthander2011-12-281-4/+5
| | | | | | | | Adds general information about global capabilities, how the server ownership is administered. Change-Id: Id34eca1e92d25b9e0bfdd30fb14a1d880497ca48 Signed-off-by: Fredrik Luthander <fredrik.luthander@sonyericsson.com>
* First Cut of Gerrit Walkthrough Introduction documentation.Ed Costello2011-12-2812-0/+395
| | | | | | | | | Intended to be a complement for the existing reference documentation to allow potential users to easily get a feel for how Gerrit is used, where it fits and whether it will work for them. Change-Id: Ibbbba36873ee9185d5998eb337b26cc7761b215e Signed-off-by: Fredrik Luthander <fredrik.luthander@sonyericsson.com>
* Access control documentation: Added non-interactive usersFredrik Luthander2011-12-281-18/+39
| | | | | | | | | This change adds the non-interactive user group. It also adds that groups can be members of other groups. The groups are now sorted in alphabetical order. Change-Id: I2cc31de5bc9ede1b6177a005c228ff0c9f72e0e0 Signed-off-by: Fredrik Luthander <fredrik.luthander@sonyericsson.com>
* Access control documentation: Reordering categoriesFredrik Luthander2011-12-281-198/+198
| | | | | | | | Access categories are now sorted to match drop down box in UI This commit is made to prepare for the rewrite of categories in accordance with how they work in the Gerrit 2.2.x series. Change-Id: I7229335f86ce24ec1fceecaea71e3fa1158f15ca
* Added additional information on the install instructions.Fredrik Luthander2011-12-281-17/+58
| | | | | | | The installation instructions presumes much prior knowledge. This is an attempt at making some of that knowledge less implicit. Change-Id: I56195eedbe8c73248e2545a95f2237d16a1d54ed
* Provides a template to the download example.Fredrik Luthander2011-12-281-4/+15
| | | | | | Clarifies that the example host must be replaced with proper hostname. Change-Id: Ib6feef2957a540a3e4635672f70729be2a10f27c
* Provided an example on how to abandon a changeFredrik Luthander2011-12-281-0/+5
| | | | | | | | Added command line example to abandon a certain change. The example was made to be as similar as possible to the previous examples, reusing the same virtual SHA1. Change-Id: I7f2ed88c59856d2a173aed3f8c3e84e4ec187b66
* documentation: update links from kernel.org to code.google.comAugie Fackler2011-12-283-3/+3
| | | | Change-Id: Ie2448e778b10eaf0d35053f373c4fcb2571d3b00
* Update project configuration documentationEdwin Kempin2011-12-281-2/+1
| | | | | | | | | Since the projects are not anymore stored in the Gerrit database there is no SQL insert statement anymore to create new projects. Hence remove the textual reference to such a statement. Change-Id: Ib7eb8adefb41fd0e94d51647a5c0cb9032ca3523 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* Rename '-- All Projects --' in documentation to 'All-Projects'Edwin Kempin2011-12-281-5/+5
| | | | | | | | | The wild project that is the root project for all other projects was renamed from '-- All Projects --' to 'All-Projects', but some places in the Gerrit documentation were not updated. Change-Id: I6b908b6e80c9e7861011a23f3b25608728943caf Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* Explain 'Automatically resolve conflicts'Edwin Kempin2011-12-281-0/+5
| | | | | | | | In the Gerrit documentation explain the project option 'Automatically resolve conflicts'. Change-Id: Ib43316092001d5f02ba68507c95c7bfd3ad049ce Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* Update documentation for testing SSH connectionEdwin Kempin2011-12-281-4/+15
| | | | | | | | The command output that is shown in the example and the description how to set the ssh username are outdated. Update both to be correct again. Change-Id: I1529e9c46ba35462ad3bf411b30cfaa4c74cead5 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* Remove unneeded escape characters from the documentationEdwin Kempin2011-12-2810-64/+64
| | | | | | | | | | | | | | There was an incompatible upgrade of asciidoc. The old version of asciidoc required certain characters to be escaped with a backslash and when the upgrade to the new version was done all those backslashes that were used for escaping became visible. These unneeded backslashes in the documenation are confusing to users, especially since they mainly appear in syntax examples (where the syntax gets incorrect if the backslahes are included). With this change all unneded backslashes are removed from the Gerrit documentation. Change-Id: I6b71ac558344b07cdbc73c67c472c0186e8f50f2 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* Update pom to use gwtexpui 1.2.5v2.2.2-rc0Martin Fick2011-12-191-1/+1
| | | | | | | | This should bring in change Ia7754481daea103be0664891aa612d6a13d8e344 Fix: Issue where Gerrit could not linkify certain URLs Change-Id: If97ab9ff620454a4920f4e9f94842c711426e1f9
* Fix: Gerrit cannot display Change with non-resolvable Merge CommitGustaf Lundh2011-12-191-1/+8
| | | | | | | | | | | | | | | | | | The commit 6fd52badf224e91dd23b6a859d62334672b70803 introduces support for displaying the resolved merge result in in uploaded merge commits. However, if the merge commit introduces a merge that is not resolvable but JGIT (I.e. CrissCross merges), the automatic merge would fail, throw an unhandled IOException, effectively not allowing Gerrit to display the change page at all. This fix allows gerrit to catch these exception, allowing the Change to still be reachable through the WebUI. Change-Id: I26fbe60695be2c8ec232b50703c5395a0493d4de
* Updating pom to prologCafe 1.3Martin Fick2011-12-161-1/+1
| | | | Change-Id: Id9a936696d8c82cb61b8bdc0423cf0706602f991
* Fix: Don't check for multiple change-ids when push to refs/heads.Gustaf Lundh2011-10-261-17/+19
| | | | | | | | | Do not check for missing or multiple change-ids if pushing directly to refs/heads. Bug: http://code.google.com/p/gerrit/issues/detail?id=805 Change-Id: Ie7ccff04baef9797fbc6960c03b7dc01f93d706e
* Bumped Brics version to 1.11.8Gustaf Lundh2011-10-261-1/+1
| | | | | | | | | | | Motivation behind the bump is the following Gerrit targeted Brics patch, which was included in the 1.11.8 release: https://github.com/GLundh/dk.brics.automaton/commit/75175c3 This Brics version fixes a performance issue in some larger Gerrit systems. Change-Id: I53637988fbe1769d2d18860b7ebe70f70781786c
* Don't delete account_id row on MySQLShawn O. Pearce2011-10-181-1/+0
| | | | | | | | If the table is an InnoDB table deleting the row after allocation may cause the sequence to reset when the server restarts, giving out duplicate account_ids later. Change-Id: I3e81df92a2a09c2024e047d5eef349f6524f83db
* Predicates to check commit messages and editsJason Tsay2011-09-053-0/+235
| | | | | | | | | | | | | Adds predicate commit_message that returns the commit message as a symbol. commit_message_matches takes in a regex pattern and checks it against the commit message, returns true if a match is found. Adds predicate commit_edits that takes in a regex pattern for filenames and a regex pattern for edits. For all files in a commit that match the filename regex, if the edits in any of those files match the edit regex, then the predicate returns true. Change-Id: I1c0b5ddb669aaca77908e18d7bb314c5aa6aec70 (cherry picked from commit 0cec9e6f7ff1e62ce7f4e487e6a06e2a973baeb7)
* Move maven repository and documentationShawn O. Pearce2011-09-053-9/+4
| | | | | | | | This frees up the main gerrit project on Google Code for just the sources, allowing us to switch the version control system to Git and maintain a copy of Gerrit at the Gerrit project. Change-Id: Ib33bbff8682d0d865e65b3801ba8910bacae4eda
* Merge "Allow container-based authentication for git over http"Martin Fick2011-08-315-6/+131
|\
| * Allow container-based authentication for git over httpChristian Halstrick2011-08-315-6/+131
| | | | | | | | | | | | | | | | | | | | | | | | Gerrit was insisting on DIGEST authentication when doing git over http. This change allows to configure gerrit to trust the container to do the authentication. A new boolean configuration parameter auth.trustContainerAuth was introduced. Change-Id: Ie527ed2c9e73c4f7136b271c66ee8b621fc4c79a Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
* | Merge "Don't allow commit_delta to access commit message"Martin Fick2011-08-291-4/+8
|\ \ | |/ |/|
| * Don't allow commit_delta to access commit messageJason Tsay2011-08-171-4/+8
| | | | | | | | Change-Id: I393efae8ecb51f442a7f2be7bf37edcfd619fb4e
* | Added cla-signed hookMike Wiederhold2000-12-313-5/+48
| | | | | | | | | | | | | | The cla-signed hook is fired every time a user accepts a contributor license agreement. Change-Id: Ia907b879e84517fe16ed898e6eaf6cff1d80bbdf
* | Merge "Add additional information in Groups Table."Martin Fick2011-08-259-19/+70
|\ \
| * | Add additional information in Groups Table.Raviteja Sunkara2011-08-249-19/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns for 'Owners', 'Group Type', 'Email Only Authors' and 'Visible To All' into the groups table used by Admin->Groups Screen and MyGroups Screen. Adding more info to this table helps the administrators to view the settings and additional info of a group faster without clicking on each group. This can work as a dashboard or report that contains the info for all the groups in one place. As an example, this allows one to quickly find all the groups which are having emails squelched. Change-Id: Ia952e9dcecf415c4fce7001a0d28ad4731ff5b1c
* | | Fix minor spelling mistake in Gerrit documentationEdwin Kempin2011-08-251-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia3a028698ee87b7cda17cc44e53db287ed1d40f3 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
* | | Merge "Add createdOn to Changes in query output"Martin Fick2011-08-242-0/+2
|\ \ \
| * | | Add createdOn to Changes in query outputMartin Fick2011-08-192-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: 1093 Change-Id: I3ddbad7523d05f252c3f4ad112d38fc149097223
* | | | Merge "Fix case-issue with path name on Windows"Martin Fick2011-08-242-4/+8
|\ \ \ \
| * | | | Fix case-issue with path name on WindowsAdrian Goerler2011-08-102-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests SchemaCreatorTest and SchemaUpdaterTest sometimes fail on windows when executed from the MSysGit Bash. The issue is caused by the fact that NTFS is preserving case but is not case-sensitive. The tests use the current working directory to create a review site and compare its path name with the path name from the system configuration. On NTFS, these path names may differ in upper/lower-case causing the tests to fail. Using a canonical path fixes the issue. Change-Id: I1445b85cb4677a20308fefdd15552cb589aebc1b Signed-off-by: Adrian Goerler <adrian.goerler@sap.com>
* | | | | Merge "Disable submit button if merge will fail"Martin Fick2011-08-2418-92/+301
|\ \ \ \ \
| * | | | | Disable submit button if merge will failcarloseduardo.baldacin2011-08-1118-92/+301
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature aims to test the mergeability of each change tagging it according to the result (true or false). When the change page is load, the test is triggered and the sha1 of the dest branch (tested against) is stored within the change table. The submit button will be enabled or disabled according to the result. The test is triggered only if it’s outdated. As the branch evolves the sha1 stored at the moment of the test becomes different from the last one merged into the branch, meaning the test is outdated. Bug: issue 381 Change-Id: I8bdb26db6fc35067b8c14b987984cfd80745f3d3
* | | | | Merge "Adding support for case option in localPart."Martin Fick2011-08-242-16/+228
|\ \ \ \ \
| * | | | | Adding support for case option in localPart.Bruce Zu2011-08-232-16/+228
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow admin to set accountSshUserName = ${mail.localPart.toUpperCase} or accountSshUserName = ${mail.localPart.toLowerCase} in gerrit.config under ldap. Change-Id:I61f89ba0ed22325e678d276fefc95c72e431e450
* | | | | Merge "Clairify trackingid documentation regarding multiple footer tags."Martin Fick2011-08-241-1/+3
|\ \ \ \ \