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 DefaultMergeStyle option to repository #14789

Merged
merged 13 commits into from
Mar 27, 2021
Merged

Add DefaultMergeStyle option to repository #14789

merged 13 commits into from
Mar 27, 2021

Commits on Feb 24, 2021

  1. Add DefaultMergeStyle option to repository 

    Fixes go-gitea#12293
    @parnic
    parnic committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    1ce4557 View commit details
    Browse the repository at this point in the history

  2. Fix missing migration - satisfy linter

    @parnic
    parnic committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    af12149 View commit details
    Browse the repository at this point in the history

  3. Update to latest formatting 

    This was originally based on the 1.13.2 branch, but it seems this has changed in master
    @parnic
    parnic committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    0de9098 View commit details
    Browse the repository at this point in the history

  4. Update swagger

    @parnic
    parnic committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    7d7fc58 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2021

  1. Remove migration 

    There's no real need for this as the default handles a missing setting.
    @parnic
    parnic committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    70dd7e4 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2021

  1. Merge branch 'master' into add-default-merge-style

    @parnic
    parnic authored Mar 5, 2021
    Configuration menu
    Copy the full SHA
    750838f View commit details
    Browse the repository at this point in the history

  2. Fix whitespace from GitHub merge

    @parnic
    parnic committed Mar 5, 2021
    Configuration menu
    Copy the full SHA
    e9ba177 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2021

  1. Merge branch 'master' into add-default-merge-style

    @lafriks
    lafriks authored Mar 7, 2021
    Configuration menu
    Copy the full SHA
    b598ee4 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. Merge branch 'master' into add-default-merge-style

    @parnic
    parnic authored Mar 17, 2021
    Configuration menu
    Copy the full SHA
    b77dab6 View commit details
    Browse the repository at this point in the history

  2. Fix whitespace after GitHub merge

    @parnic
    parnic committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    3b79b0a View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. Merge branch 'master' into add-default-merge-style

    @techknowlogick
    techknowlogick authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    fabe121 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into add-default-merge-style

    @lunny
    lunny authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    618fb87 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2021

  1. Merge branch 'master' into add-default-merge-style

    @6543
    6543 authored Mar 27, 2021
    Configuration menu
    Copy the full SHA
    fea0e26 View commit details
    Browse the repository at this point in the history