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

[suggest] change merge strategy： do not check write access if user in merge white list #10951

Merged
merged 18 commits into from
Apr 8, 2020
Merged

[suggest] change merge strategy： do not check write access if user in merge white list #10951

merged 18 commits into from
Apr 8, 2020

Commits on Apr 4, 2020

  1. [suggest] change merge strategy： do not check write access if user in… 

    … merge white list go-gitea#10935

(cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)
    @everhopingandwaiting
    everhopingandwaiting committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    fe6d2e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into patch-2-merge-strategy-temp

    @everhopingandwaiting
    everhopingandwaiting committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    4aa47e7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into patch-2-merge-strategy-temp

    @everhopingandwaiting
    everhopingandwaiting committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    cfd30af View commit details
    Browse the repository at this point in the history

  4. fix NPE

    @everhopingandwaiting
    everhopingandwaiting committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    7755e10 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2020

  1. Merge branch 'master' into patch-2-merge-strategy-temp

    @everhopingandwaiting
    everhopingandwaiting committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    dff428f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into patch-2-merge-strategy-temp

    @zeripath
    zeripath committed Apr 5, 2020
    Configuration menu
    Copy the full SHA
    cbbb402 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Fix cross compile (go-gitea#10952) 

    * Fix cross compile

* Add test for cross compile

* Fix drone

* Fix drone

* Also prevent CC environment not to generate

Co-authored-by: zeripath <[email protected]>
    @lunny @zeripath @everhopingandwaiting
    2 people authored and everhopingandwaiting committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    f1edeb9 View commit details
    Browse the repository at this point in the history

  2. fix merge box icon color bug (go-gitea#10974) 

    that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <[email protected]>
    @a1012112796 @everhopingandwaiting
    a1012112796 authored and everhopingandwaiting committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    dc1a473 View commit details
    Browse the repository at this point in the history

  3. [skip ci] Updated translations via Crowdin

    @GiteaBot @everhopingandwaiting
    GiteaBot authored and everhopingandwaiting committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    7f49034 View commit details
    Browse the repository at this point in the history

  4. Allow X in addition to x in tasks (go-gitea#10979) 

    Signed-off-by: Andrew Thornton <[email protected]>
    @zeripath @everhopingandwaiting
    zeripath authored and everhopingandwaiting committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    87c4bc1 View commit details
    Browse the repository at this point in the history

  5. remove api: merge reqRepoWriter

    @everhopingandwaiting
    everhopingandwaiting committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    6e94a61 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into patch-2-merge-strategy-temp

    @everhopingandwaiting
    everhopingandwaiting committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    d931ea2 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. Merge branch 'master' into patch-2-merge-strategy-temp

    @techknowlogick
    techknowlogick committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    fe38a93 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into patch-2-merge-strategy-temp

    @everhopingandwaiting
    everhopingandwaiting committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    fa27e5b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into patch-2-merge-strategy-temp

    @everhopingandwaiting
    everhopingandwaiting committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    fc0e25d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into patch-2-merge-strategy-temp

    @techknowlogick
    techknowlogick committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    0352a86 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into patch-2-merge-strategy-temp

    @zeripath
    zeripath committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    ff1fb2e View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Merge branch 'master' into patch-2-merge-strategy-temp

    @guillep2k
    guillep2k committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    cf9bade View commit details
    Browse the repository at this point in the history