Skip to content

Conversation

M4RKUS-11111
Copy link
Contributor

Add check if head is equal to base

Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about the error message - but the rest is fine ;D

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 25, 2020
@6543 6543 added this to the 1.14.0 milestone Oct 25, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 26, 2020
@codecov-io
Copy link

Codecov Report

Merging #13308 into master will decrease coverage by 0.02%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13308      +/-   ##
==========================================
- Coverage   42.16%   42.14%   -0.03%     
==========================================
  Files         689      689              
  Lines       75810    75814       +4     
==========================================
- Hits        31968    31950      -18     
- Misses      38611    38632      +21     
- Partials     5231     5232       +1     
Impacted Files Coverage Δ
routers/api/v1/repo/pull.go 24.84% <0.00%> (-0.21%) ⬇️
models/unit.go 46.57% <0.00%> (-2.74%) ⬇️
modules/charset/charset.go 73.03% <0.00%> (-2.25%) ⬇️
services/gitdiff/gitdiff.go 67.39% <0.00%> (-1.99%) ⬇️
modules/log/event.go 59.90% <0.00%> (-1.89%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c40df54...db0a430. Read the comment docs.

@lafriks lafriks merged commit ff1b000 into go-gitea:master Oct 26, 2020
@lafriks lafriks added the modifies/api This PR adds API routes or modifies them label Oct 26, 2020
@lafriks
Copy link
Member

lafriks commented Oct 26, 2020

please send backports to release/v1.12 and release/v1.13 branches

@M4RKUS-11111 M4RKUS-11111 deleted the fix_api_create_pullrequest_master_to_master branch October 26, 2020 18:11
M4RKUS-11111 added a commit to M4RKUS-11111/gitea that referenced this pull request Oct 27, 2020
* Deny wrong pull

* Update routers/api/v1/repo/pull.go

Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: Markus <git+markus@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
M4RKUS-11111 added a commit to M4RKUS-11111/gitea that referenced this pull request Oct 27, 2020
* Deny wrong pull

* Update routers/api/v1/repo/pull.go

Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: Markus <git+markus@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
@lafriks lafriks added the backport/done All backports for this PR have been created label Oct 27, 2020
zeripath added a commit that referenced this pull request Oct 27, 2020
* Deny wrong pull

* Update routers/api/v1/repo/pull.go

Co-authored-by: Markus <git+markus@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
techknowlogick pushed a commit that referenced this pull request Oct 27, 2020
* Deny wrong pull (#13308)

* Deny wrong pull

* Update routers/api/v1/repo/pull.go

Co-authored-by: zeripath <art27@cantab.net>

Co-authored-by: Markus <git+markus@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>

* CI.restart()

Co-authored-by: Markus <git+markus@obermui.de>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
ivanvc added a commit to ivanvc/gitea that referenced this pull request Oct 27, 2020
…s-stored-in-email-address-table

* origin/master:
  [UI] Hide consecutive additions and removals of the same label (go-gitea#13315)
  [skip ci] Updated translations via Crowdin
  Fix send mail (go-gitea#13312)
  [skip ci] Updated translations via Crowdin
  Deny wrong pull (go-gitea#13308)
  Group Label Changed Comments in timeline (go-gitea#13304)
  [skip ci] Updated translations via Crowdin
  Attempt to handle unready PR in tests (go-gitea#13305)
  go-gitea#12897 - add mastodon provider (go-gitea#13293)
  [skip ci] Updated translations via Crowdin
  Fix Storage mapping (go-gitea#13297)
  Update Mirror IsEmpty status on synchronize (go-gitea#13185)
  Fix bug isEnd detection on getIssues/getPullRequests (go-gitea#13299)
  systemd service: Add commented PATH environment option for Git prefix (go-gitea#13170)
  Sendmail command (go-gitea#13079)
  Various UI and arc-green fixes (go-gitea#13291)
@go-gitea go-gitea locked and limited conversation to collaborators Dec 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants