Commits on Jul 2, 2012
  1. @spearce

    Fix units of httpd.maxwait

    The default unit here is minutes, but Jetty wants to get milliseconds
    from the maxWait field. Convert the minutes returned by getTimeUnit to
    be milliseconds, matching what Jetty expects.
    
    This should resolve a large number of 503 errors for Git over HTTP.
    
    Change-Id: I43cd65c2e17cf0e7eb44b4e67b3ae843e883fc55
    spearce committed Jul 2, 2012
Commits on Jun 29, 2012
  1. Merge "When adding a user to a group create an account for the user i…

    …f needed"
    Martin Fick committed with gerrit code review Jun 28, 2012
Commits on Jun 28, 2012
  1. @spearce

    Merge "E-mail subject truncation is over-eager"

    spearce committed with gerrit code review Jun 28, 2012
  2. @EdwinKempin

    Merge "Make sure we use only one type of NoteMerger for review notes …

    …creation."
    EdwinKempin committed with gerrit code review Jun 28, 2012
  3. @EdwinKempin
  4. @wmfphab

    E-mail subject truncation is over-eager

    When truncating the subject, we don't want to make the resulting
    subject with ... longer than it would've been originally, so check
    based on the length + 3 rather than the length alone.
    
    Change-Id: Idff4cdf46d73caea94a8f282a19dcd6d25cbb5a5
    wmfphab committed Jun 28, 2012
  5. @EdwinKempin

    Merge "Unset executable file mode flag on StreamEvents.java"

    EdwinKempin committed with gerrit code review Jun 28, 2012
  6. @dpursehouse @celgemark

    Unset executable file mode flag on StreamEvents.java

    Change-Id: I84bd6e64ad640349df00357a2212214c3f56ef06
    dpursehouse committed with celgemark Jun 28, 2012
  7. @EdwinKempin
Commits on Jun 27, 2012
  1. Merge "Also check if user can upload in order to restore"

    Martin Fick committed with gerrit code review Jun 27, 2012
  2. @wmfphab

    Also check if user can upload in order to restore

    The thought behind this is that a restoration is an upload, and
    the workaround for not restoring would be to make a fresh upload
    (which we don't want).
    
    The main use case is the scenario in which a branch has been
    closed to further improvements and changes shouldn't be restored.
    
    Rather than introduce a new permission for this, keep the abandon
    conditions so someone can undo an accidental abandon.
    
    Change-Id: I31fa95c1325ac932f1fc2c90abf3a5a42c1b24db
    wmfphab committed Jun 27, 2012
  3. Fix NPE that can hide guice CreationException on site init

    Note that the --show-stack-trace option is needed to print the stack
    trace when a program stops with a Die exception.
    
    Change-Id: Icf6a9cb8b2c14841ad9c354985f7c12f583e84c8
    Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
    Sasa Zivkov committed Jun 27, 2012
  4. @spearce

    Merge "Only show draft change dependency if current user is owner or …

    …reviewer"
    spearce committed with gerrit code review Jun 27, 2012
  5. @dpursehouse @spearce

    Only show draft change dependency if current user is owner or reviewer

    In the change screen, the dependencies panel shows draft changes in
    the "Depends On" and "Needed By" lists for all users, and when there
    is no user logged in.  This is incorrect; draft changes should only
    be visible to their owner and users who have been added as reviewer.
    
    Add a check when building the dependency lists, to exclude draft
    changes that are neither owned by the currently signed in user nor
    include the signed in user as reviewer.
    
    Bug: Issue 1442
    Change-Id: Ib01db1cb9e9071110217ce727dbb07c23ecfc199
    dpursehouse committed with spearce Jun 25, 2012
  6. @spearce

    Merge "Make sure asciidoc uses unix line endings in generated HTML."

    spearce committed with gerrit code review Jun 27, 2012
  7. @spearce

    Merge "Add Maven profile to skip build of plugin modules"

    spearce committed with gerrit code review Jun 27, 2012
  8. @EdwinKempin
  9. Make sure asciidoc uses unix line endings in generated HTML.

    The difference in the size of gerrit-2.4.1.war and gerrit-2.4.2.war is
    about 50K. Main reason is that the HTML produced by asciidoc in
    2.4.1 contains windows line endings while in 2.4.2 it contains unix line
    endings.
    
    Use an explicit asciidoc attribute to make sure the produced HTML will
    always contain unix line endings.  This will help in producing build
    results that are better comparable by size.
    
    Besides the line endings, there are actually some more differences in
    the produced HTML files.  They probably come from usage of different
    version of asciidoc for producing 2.4.1 and 2.4.2.  We may want to agree
    on, and enforce, using a particular asciidoc version for producing
    Gerrit releases.
    
    Change-Id: Iee938d3aeaa266e72b62241778855aaaa3409ef6
    Sasa Zivkov committed Jun 27, 2012
  10. @dpursehouse @celgemark

    Add documentation of "change closed" error when using ssh review

    The "change closed" error can also occur when trying to submit a
    review label with the ssh review command onto a change that has
    been closed (submitted and merged, or abandoned) or onto a patchset
    that has been replaced by a newer patchset.
    
    Add this in the documentation.
    
    Change-Id: Ic26e28b085e5d52742f593f7c2ce216c50a9db20
    dpursehouse committed with celgemark Jun 27, 2012
  11. Add Maven profile to skip build of plugin modules

    Building the plugin modules ('Plugin API' and 'Plugin Archetype') may
    take a significant amount of time (since many jars are downloaded).
    During development it is not needed to build the plugin modules. This
    change adds a Maven profile that skips the build of the plugin modules,
    so that developers have a faster turnaround. This profile is called
    'no-plugins' and it's active by default. To include the plugin modules
    into the build activate the 'all' profile:
    
    mvn clean package -P all
    
    The script to make release builds has been adapted to activate the
    'all' profile so that the plugin modules are always built for release
    builds.
    
    Change-Id: I6c3bd7dfcb80f1bf9d681a660d6fca2707b35f75
    Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
    Edwin Kempin committed Jun 25, 2012
Commits on Jun 26, 2012
  1. @spearce

    Merge "Move handling of ListPluginsServlet to HttpPluginServlet"

    spearce committed with gerrit code review Jun 26, 2012
  2. Merge "create-group: document that account is created if LDAP auth su…

    …cceeds"
    Martin Fick committed with gerrit code review Jun 26, 2012
  3. @bklarson

    Move handling of ListPluginsServlet to HttpPluginServlet

    HttpPluginServlet already handles serving URLs in the "/plugins/*"
    namespace.  It makes sense to have it also serve the "/plugings/" URL,
    as we will add more actions soon, such as /plugins/?reload and
    /plugins/?install.
    
    Change-Id: Ic5eb5d9169139b8ded021a0e0f1cf421be0b2927
    Signed-off-by: Brad Larson <bklarson@gmail.com>
    bklarson committed Jun 26, 2012
  4. Make sure we use only one type of NoteMerger for review notes creation.

    At some point in time the DefaultNoteMerger from jgit was copied to
    Gerrit, named ReviewNoteMerger and was slightly modified. Since then
    Gerrit used the ReviewNoteMerger when updating existing notes and
    DefaultNoteMerger when resolving conflicts on ref-update.
    
    This change fixes this small inconsistency.
    
    Change-Id: Ic460e01d3a00c7eb35ad2a523607f8ba0e55a176
    Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
    Sasa Zivkov committed Jun 22, 2012
  5. Factor out code for updating notes branches to NotesBranchUtil.

    The CreateCodeReviewNotes and BanCommit classes both need the same
    functionality of updating a notes branch and automatic merge of note
    trees. The code was repeated in both classes with slight variations.
    The same functionality will probably be needed as soon as we introduce
    yet another special purpose notes branch.
    
    Change-Id: If2fc17cd795585a9f90bb0bf82695db9bd04392c
    Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
    Sasa Zivkov committed May 10, 2012
  6. @EdwinKempin
  7. @dpursehouse @celgemark

    Correct documentation of "invalid author/committer" errors

    The error messages "you are not committer ..." and "you are not
    author ..." were replaced with "invalid author" and "invalid
    committer" in change ed2d1b1, but the corresponding documentation
    was not updated.
    
    Rename the files and update with the correct error messages.
    
    Change-Id: Ia62affe14cb3c4411479f8c8d83880eac784a959
    dpursehouse committed with celgemark Jun 26, 2012
Commits on Jun 25, 2012
  1. @spearce

    Merge branch '2012-06.access-sort'

    * 2012-06.access-sort:
      Release notes for 2.4.2
      Release notes for 2.3.1
      Release notes for 2.2.2.2
      Fix permissions bug caused by directly inheriting from All-Projects
    spearce committed Jun 25, 2012
  2. create-group: document that account is created if LDAP auth succeeds

    The 'create-group' command allows to add initial group members with the
    '--member' option. Trying to add a user that doesn't have an account in
    Gerrit fails, unless LDAP is used for authentication. If LDAP is used
    for authentication and the user is not found, Gerrit tries to
    authenticate the user against the LDAP backend. If the authentication
    is successful a user account is automatically created, so that the user
    can be added to the group. Describe this feature in the documentation
    of the 'create-group' command.
    
    Change-Id: I753e546c311b963afd0ebd8571dc3df63183b86d
    Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
    Edwin Kempin committed Jun 25, 2012
  3. Tighten UUID regexp used to check if a group is internal

    The regular expression in AccountGroup.isInternalGroup() used
    to determine whether a group identified by a particular UUID
    is an internal Gerrit group was sloppy in that any UUID
    containing a 40 (or more) character hex digit sequence anywhere
    in the string was deemed an internal group. While very unlikely,
    the expression could falsely match UUIDs from other systems.
    
    Change-Id: Ie7cc56754bc11a6526fa1f35ea449e11b6c47a30
    Magnus Bäck committed Jun 25, 2012
  4. sshd: Add verbose output option to ls-groups command

    The verbose mode enabled by the new option makes the ls-groups
    command output a tab-separated table containing all available
    information about each group (though not its members).
    
    Change-Id: I8514a784c9e838d28edb62e5ca84fb4514d2928c
    Magnus Bäck committed Mar 27, 2012
Commits on Jun 24, 2012
  1. @lucamilanesio @spearce

    Git over HTTP BasicAuth against Gerrit basic auth.

    Allows the configuration of native Gerrit
    username/password authentication scheme used for
    Git over HTTP BasicAuth, as alternative of default
    DigestAuth scheme against the random generated
    password on Gerrit DB.
    
    Example gerrit.config:
    
    [auth]
            type = LDAP
            gitBasicAuth = true
    
    Git over HTTP protocol will be authenticated using
    HTTP-BasicAuth and credentials checked on LDAP.
    
    Change-Id: Ibe589ab2b0887d85fd5ae5a4c110dea10dac5d6d
    lucamilanesio committed with spearce Jan 5, 2012
  2. @spearce

    Merge "Add more steps to the announcement process"

    spearce committed with gerrit code review Jun 23, 2012
  3. @spearce

    Merge "Minor updates to release docs"

    spearce committed with gerrit code review Jun 23, 2012
Commits on Jun 23, 2012
  1. Add more steps to the announcement process

    * Add to the NEWS section on main website
    * Make Discussion Group thread sticky/unsticky
    
    Change-Id: Idaeaacbf75a954c6ddbb87cba243861d89795e66
    Martin Fick committed Jun 23, 2012