Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add squash merges option for editorial workflow #1330

Merged
merged 15 commits into from
May 14, 2018
Merged

Add squash merges option for editorial workflow #1330

merged 15 commits into from
May 14, 2018

Commits on Apr 29, 2018

  1. Add mergeMethod option to API config.

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    324b7fc View commit details
    Browse the repository at this point in the history

  2. Use snake case for merge_method key

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    a25056b View commit details
    Browse the repository at this point in the history

  3. Add merge_method to mergePR() request

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    0a39422 View commit details
    Browse the repository at this point in the history

  4. Get merge_method setting from backend config

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    12f409d View commit details
    Browse the repository at this point in the history

  5. Document merge_method backend option

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    7dcb7e9 View commit details
    Browse the repository at this point in the history

  6. Update contributor details.

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    0598c72 View commit details
    Browse the repository at this point in the history

  7. Switch to boolean squash or standard merge config.

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    db27590 View commit details
    Browse the repository at this point in the history

  8. Add config validation for backend.squash_merges option.

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    93d20cc View commit details
    Browse the repository at this point in the history

  9. Pass squash_merges option to new API() calls.

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    94ed858 View commit details
    Browse the repository at this point in the history

  10. Improve explanation in docs.

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    c6ab176 View commit details
    Browse the repository at this point in the history

  11. Improve explanation in docs.

    @delucis
    delucis committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    94964b8 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2018

  1. Move squash_merges documentation to Beta Features page.

    @delucis
    delucis committed May 3, 2018
    Configuration menu
    Copy the full SHA
    e8bc69c View commit details
    Browse the repository at this point in the history

Commits on May 5, 2018

  1. Simplify documentation language for clarity.

    @delucis
    delucis committed May 5, 2018
    Configuration menu
    Copy the full SHA
    1e379e9 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2018

  1. Remove config validation. 

    This reverts commit 93d20cc.
    @delucis
    delucis committed May 12, 2018
    Configuration menu
    Copy the full SHA
    48c1b2f View commit details
    Browse the repository at this point in the history

Commits on May 14, 2018

  1. update docs

    @erquhart
    erquhart committed May 14, 2018
    Configuration menu
    Copy the full SHA
    b644032 View commit details
    Browse the repository at this point in the history