Permalink
Commits on Mar 28, 2014
  1. Merge pull request #28 from basho/feature/delete-feature-branch-on-merge

    Optionally delete the pull-request source branch
    brson committed Mar 28, 2014
  2. Optionally delete the pull-request source branch

    If `delete_source_branch` is set to true in the config, bors will
    automatically try and delete the source branch once the pull-request has
    been succesfully merged. When no value is set in the config, bors will
    _not_ delete the feature branch.
    reiddraper committed Mar 28, 2014
Commits on Mar 10, 2014
  1. Merge pull request #27 from basho/multiple-repo-html

    Support multiple repos in bors.html
    brson committed Mar 10, 2014
  2. Merge pull request #26 from basho/check-github-status-api

    Allow bors to look at gihtub commit status API for merge commit
    brson committed Mar 10, 2014
Commits on Mar 4, 2014
  1. Make sure the PR links point to the destination repo

    Vagabond committed with Jared Morrow Mar 4, 2014
  2. Support multiple repositories in bors.html

    Pair-programmed with @Vagabond.
    
    bors.html now allows you to choose a specific repository to view, based
    on the query string. This is useful if you run bors for multiple repos,
    but in the same directory. If there is only one repository, this change
    is backward compatible, as it defaults to the singleton repository.
    The main change is to wrap the json inside of a map, which is keyed off
    of the repository name. The javascript that runs inside the html file
    then looks up the queue, based on the query string. If no query-string
    is provided (and there is more than one repository), then a list of
    available repos is shown.
    reiddraper committed with Jared Morrow Mar 3, 2014
  3. Merge pull request #25 from basho/fix-key-error-with-test-ref

    Fix key error exception
    brson committed Mar 4, 2014
Commits on Mar 3, 2014
  1. Allow bors to look at gihtub commit status API for merge commit

    Pair-programmed with @reiddraper
    
    Instead of polling buildbot's JSON status, if you have your CI server
    (not just buildbot but even something like TravisCI) posting to the
    github status API, you can use the new 'use_github_commit_status_api'
    boolean option to check for the commit status on the merge commit to see
    if the integration commit has passed the tests.
    Vagabond committed with Jared Morrow Mar 3, 2014
  2. Fix key error exception

    Pair programmed with @Vagabond.
    
    Grabbing a value with [] syntax will throw an exception
    if the key doesn't exist. So we safely grab it with 'get'.
    reiddraper committed with Jared Morrow Mar 3, 2014
Commits on Mar 2, 2014
  1. Merge pull request #24 from brson/basho

    A few patches
    brson committed Mar 2, 2014
  2. Merge pull request #21 from basho/basho-features

    Basho features
    brson committed Mar 2, 2014
  3. Load the merge_sha before merging a PENDING PR

    Fixes exceptions being thrown during calls to fresh when examening
    PENDING PRs
    brson committed Mar 2, 2014
Commits on Mar 1, 2014
Commits on Feb 28, 2014
  1. Implement a 'no_auto_merge' option

    Pair-programmed with @reiddraper
    
    As an option, require bors to see an "@mention merge" comment from a
    collaborator before doing the final fast forward of the target branch.
    
    Some Basho engineers are not yet comfortable with PRs being auto-merged.
    This allows them to 'get their ducks in a row' before the PR is merged.
    Vagabond committed with Jared Morrow Feb 28, 2014
  2. Don't manually close PRs after merging

    Pair programmed with @Vagabond.
    
    We tested this and github will automatically set the status of the
    pull-request to closed/merged if the HEAD of the feature branch is
    contained in the target branch. This happens when we fast-forward the
    target branch to the merge-sha. And specifically, it looks at the target
    branch, not whatever the default branch is set to in github
    (master/develop).
    reiddraper committed with Jared Morrow Feb 28, 2014
  3. Use bors' github username in integration branch

    Don't hardcode 'borshop' as part of the integration branch name.
    reiddraper committed with Jared Morrow Feb 28, 2014
  4. Optionally only consider $N pull-requests per run

    Pair programmed with @Vagabond
    
    If 'max_pulls_per_run' is set to a non-zero integer in the config, bors
    will only consider the $N ripest pull-requests. Setting this value to
    `1` will retain bors old behavior.
    reiddraper committed with Jared Morrow Feb 28, 2014
Commits on Feb 25, 2014
  1. Allow approval comments on the PR if they are followed by a commit SHA

    Pair-programmed with @reiddraper
    
    This allows PR comments (which are not editable by the user making the
    PR, in contrast to commit comments) to act as approval commends. However
    because the SHA is still required, the approval is still tied to a
    particular SHA so further pushes to the branch will invalidate it.
    Vagabond committed with Jared Morrow Feb 25, 2014
  2. Ignore edited comments for the purposes of control comments

    This is necessary because comments on commits are under the control of
    the fork owner, not the owner of the destination repo. This means they
    can edit any comments anyone makes on one of their commits to say
    whatever they want.
    Vagabond committed with Jared Morrow Feb 25, 2014
Commits on Feb 24, 2014
  1. Optionally read the repository-name from cmd-line

    Pair programmed with @Vagabond.
    
    With the -r or --repo argument, you can now pass in the
    respository to process. This overrides the repo config
    option in the bors.cfg file. This is useful if you have a
    number of repos that share the same config, save for their
    repository name.
    
    The local html and json files have not been updated to reflect
    this.
    reiddraper committed with Jared Morrow Feb 24, 2014
  2. Test and merge into target-branch

    Pair programmed with @Vagabond.
    
    Instead of always integrating with the master branch,
    both for testing and merging, we honor the pull-request
    target branch.
    reiddraper committed with Jared Morrow Feb 24, 2014
  3. Use github's merge message for bors merges

    Pair programmed with @Vagabond.
    
    Use the same merge-commit message that github uses
    for bors auto-merges. We also add a 'Reviewed-by' line
    as well. This may not be interesting to upstream, but it
    suits our needs.
    reiddraper committed with Jared Morrow Feb 24, 2014
  4. Allow configurable approval/disapproval tokens

    Pair programmed with @Vagabond.
    
    Instead of hardcoding r+, r=me, and r- for approval/disapproval
    tokens, we (try to) read the list of allowed tokens from the config.
    If the tokens are not overridden, we simply default to the current
    implementation.
    reiddraper committed with Jared Morrow Feb 24, 2014
  5. Add collaborators as reviewers option

    Pair programmed with @Vagabond.
    
    Fixes #16
    
    When the 'collaborators_as_reviewers' = true option is added
    to the config, the list of collaborators on the project will
    be used instead of the hardcoded reviewer list. This allows
    you to not have to keep a hardcoded list of reviewers up-to-date.
    reiddraper committed with Jared Morrow Feb 24, 2014
  6. Delete integration branches on PR-merge

    Pair programming with @Vagabond.
    
    We had to do some hackery around github retries, as the current
    github.py is not very flexible. It also didn't properly handle
    204 responses, as there was no content-type in the headers.
    reiddraper committed with Jared Morrow Feb 24, 2014
  7. Update .gitignore

    reiddraper committed with Jared Morrow Feb 24, 2014
  8. Add .gitignore

    reiddraper committed Feb 21, 2014
  9. Create unique integration branch for each PR

    Pair programming with @Vagabond.
    reiddraper committed Feb 21, 2014
  10. Advance more than one PR at once

    Pair programming with @Vagabond.
    reiddraper committed Feb 21, 2014
Commits on Feb 6, 2014
  1. Merge pull request #19 from Mortimerp9/master

    copy the bors.py comments to README.md with some formating, for github readability
    brson committed Feb 6, 2014
Commits on Feb 5, 2014