Skip to content
Commits on Oct 19, 2015
  1. @marczych

    Merge feature-clean-drop-it (#112) into master

    feature-clean: remove it
    
    It already caused loss-of-data for me.
    
    Did we really make `feature clean` a *short-cut* for `git clean -ffd`
    cause that seems kinda silly.
    marczych committed Oct 19, 2015
  2. @danielbeardsley

    Merge 'feature-merge--bail-on-merge-conflicts' (#137) into master

    feature merge: mail on merge conflicts.
    
    We had an issue recently where someone who was merging a pull
    accidentally messed up a merge conflict resolution. Now, we bail on
    merge conflicts, requiring master to be merged into the feature branch
    to keep it up to date. This ensures that code review and CI builds
    happen on exactly what will be in master, and merge conflict
    resolutions will get proper review before getting merged back.
    danielbeardsley committed Oct 19, 2015
Commits on Jul 13, 2015
  1. @danielbeardsley

    feature merge: refactor a tad

    to improve clarity and decrease chances of insecure
    commands being run.
    danielbeardsley committed Jul 13, 2015
  2. @danielbeardsley

    feature merge: bail on merge conflicts

    We had an issue recently where someone who was merging a pull
    accidentally messed up a merge conflict resolution. Now, we bail on
    merge conflicts, requiring master to be merged into the feature branch
    to keep it up to date. This ensures that code review and CI builds
    happen on exactly what will be in master, and merge conflict
    resolutions will get proper review before getting merged back.
    danielbeardsley committed Jul 13, 2015
Commits on May 1, 2015
  1. @davidrans

    Merge branch 'octokit-3'

    davidrans committed May 1, 2015
  2. @davidrans

    Merge branch 'master' into octokit-3

    Conflicts:
    	git-scripts.gemspec
    davidrans committed May 1, 2015
Commits on Apr 7, 2015
  1. @marczych

    Merge pull request #135 from iFixit/0-5-2-release

    0.5.2 Release
    marczych committed Apr 7, 2015
  2. @marczych

    0.5.2 Release

    This includes `feature start` plugin support from #133.
    marczych committed Apr 7, 2015
Commits on Mar 13, 2015
  1. @davidrans
  2. @davidrans

    Call plugin after `feature start`

    cr_req 1
    qa_req 0
    davidrans committed Mar 11, 2015
Commits on Mar 11, 2015
  1. @davidrans
  2. @davidrans

    Call plugin after `feature start`

    cr_req 1
    qa_req 0
    davidrans committed Mar 11, 2015
Commits on Feb 4, 2015
  1. @alexottoboni

    Version Number Bump

    alexottoboni committed Feb 4, 2015
Commits on Jan 28, 2015
  1. @alexottoboni

    Octokit 3: New dependencies

    Octokit 3 just uses faraday, not the faraday_middleware gem. Also
    cleaned up other gems that we no longer need.
    root committed with alexottoboni Jan 28, 2015
Commits on Jan 26, 2015
  1. @alexottoboni

    Octokit 3.0.0

    Upgrades Octokit from version 1.22 to version 3.0.0 and fixes dependency issues
    with faraday and faraday middleware.
    alexottoboni committed Jan 26, 2015
Commits on Jan 24, 2015
  1. @marczych

    Merge ruby-gems-specify-correct-versions (#131) into master

    Gemspec: Specify exact version numbers for dependencies
    
    Fresh installs of git-scripts weren't working because the way this version
    of octokit specified its dependencies meant that a newer-than-previously
    version of faraday ends up getting installed that didn't work with octokit.
    
    Also, remove ruby version specifier cause this works in multiple ruby
    versions.
    marczych committed Jan 23, 2015
  2. @marczych

    Gemspec: Comment about dependency versions

    So we know to remove them once we upgrade octokit.
    marczych committed Jan 23, 2015
  3. @marczych

    Gemspec: Bump version

    We want to be able to push this version up to rubygems now so
    installing it actually works.
    marczych committed Jan 20, 2015
  4. @alexottoboni @marczych

    Gemspec specifies exact version numbers for dependencies

    Things were breaking in git-scripts because the version numbers for a
    lot of dependencies were not specified and ended up being very different than
    what was expected.
    
    Also, we have two versions of Ruby floating around for now so I removed the
    version specifier in the Gemfile. We can't specify "at least" 1.9.3, eventually
    we want to set it to 2.0.0 since the Fedora machines will be running 2.0.0.
    alexottoboni committed with marczych Jan 20, 2015
Commits on Dec 16, 2014
  1. @danielbeardsley

    Merge version-0-5-0 (#130) into master

    Bump version to 0.5.0
    
    We haven't had a release in a while so we might as well push one now
    because having plugin support is very useful.
    danielbeardsley committed Dec 15, 2014
  2. @marczych

    Bump version to 0.5.0

    We haven't had a release in a while so we might as well push one now
    because having plugin support is very useful.
    marczych committed Dec 13, 2014
Commits on Oct 21, 2014
  1. @danielbeardsley

    Merge feature-prune--fix-a-bug (#128) into master

    feature-prune: fix some bugs
    
    It probably never worked. The 'origin/' weren't being stripped off and
    it wasn't correctly excluding stable and master.
    danielbeardsley committed Oct 20, 2014
Commits on Aug 27, 2014
  1. @xiongchiamiov

    Merge add-after-merge-plugin-hook (#129) into master

    Plugins: create after_merge invocation stage
    
    After merging, we want to remove certain labels... this makes that possible
    xiongchiamiov committed Aug 27, 2014
  2. @adam000

    Plugins: create after_merge invocation stage

    After merging, we want to remove certain labels... this makes that possible
    adam000 committed Aug 27, 2014
Commits on Aug 12, 2014
  1. @danielbeardsley

    feature-prune: fix some bugs

    It probably never worked. The 'origin/' weren't being stripped off and
    it wasn't correctly excluding stable and master.
    danielbeardsley committed Aug 12, 2014
Commits on Jun 25, 2014
  1. @BaseInfinity

    Merge pull request #127 from iFixit/work-with-pagination

    Work with pagination
    BaseInfinity committed Jun 25, 2014
Commits on Jun 24, 2014
  1. @xiongchiamiov

    Work with pagination

    @BaseInfinity pointed out to me that we were having problems merging a
    particular pull.  With a bit of investigation, it turned out it wasn't just
    that one - it was any pull that was fairly old.  This immediately brought to
    mind pagination issues, which ended up being the case.
    
    We can't use [the documented approach to pagination][0] because Octokit is now
    on version 3.2.0, and we're using [1.25.0][1]. :)  So I cloned down the repo,
    searched around, and did some guessing, and this approach appears to work:
    
    Before:
    
        [$]> ~/packages/git-scripts/bin/feature merge -n 1087
        No pull request found for this branch.
        Merge feature branch named: 'my-awesome-branch' ? (y/n): %
    
    After:
    
        [$]> ~/packages/git-scripts/bin/feature merge -n 1087
        This pull request has failed to pass continuous integration tests. Merge with caution.
        Merge feature branch named: 'my-awesome-branch' ? (y/n): %
    
    [0]: https://octokit.github.io/octokit.rb/#Pagination
    [1]: https://github.com/octokit/octokit.rb/releases/tag/v1.25.0
    xiongchiamiov committed Jun 24, 2014
Commits on Jun 13, 2014
  1. @adam000

    Merge pull request #119 from iFixit/feature-prune--fix-current-branch…

    …-case
    
    Feature prune: fix sed pipe
    adam000 committed Jun 12, 2014
  2. @adam000
Commits on Mar 31, 2014
  1. @xiongchiamiov

    Merge add-pull-request-description-hook (#124) into master

    Add message-editing hook
    
    This allows us to write a plugin that automatically prefills CCs into
    the pull request description.  Importantly, it happens *before* the user
    gets the message opened in their editor, so they can still edit it (it's
    on the same level as the pre-fill from the last commit).
    xiongchiamiov committed Mar 31, 2014
  2. @xiongchiamiov

    Add message-editing hook

    This allows us to write a plugin that automatically prefills CCs into
    the pull request description.  Importantly, it happens *before* the user
    gets the message opened in their editor, so they can still edit it (it's
    on the same level as the pre-fill from the last commit).
    xiongchiamiov committed Mar 31, 2014
Commits on Mar 5, 2014
  1. @xiongchiamiov
  2. @xiongchiamiov
Commits on Mar 2, 2014
  1. @sctice

    Start command: remove prompt

    All the command does is create a branch and configure it, both of which
    are easily undone by deleting the branch.
    sctice committed Mar 2, 2014
Commits on Feb 28, 2014
  1. @marczych

    Update finish-issue docs

    Turns out I only halfway completed the docs for finish-issue in #74.
    This fixes the command name from `finish` to `finish-issue` and also
    adds it to the feature and hotfix indices.
    marczych committed Feb 28, 2014
Something went wrong with that request. Please try again.