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.

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

[API] Pull Requests #248

Merged
merged 5 commits into from
Dec 2, 2016
Merged

[API] Pull Requests #248

merged 5 commits into from
Dec 2, 2016

Conversation

bkcsoft
Copy link
Member

@bkcsoft bkcsoft commented Nov 25, 2016

Add Pull-Request API

Migrated and Rebased from gogs/gogs#3755

@bkcsoft bkcsoft added the type/enhancement An improvement of existing functionality label Nov 25, 2016
@bkcsoft bkcsoft mentioned this pull request Nov 25, 2016
@bkcsoft
Copy link
Member Author

bkcsoft commented Nov 25, 2016

Had to update the vendored code.gitea.io/sdk since it uses new stuff 🙂

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 25, 2016
@@ -101,3 +102,24 @@ func ExtractOwnerAndRepo() macaron.Handler {
ctx.Data["Repository"] = repo
}
}

// ReferencesGitRepo ... I have no clue what this does :laughing:
Copy link
Member Author

Choose a reason for hiding this comment

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

Anyone wanna have a crack at guessing what this function does? 😆

@lunny lunny modified the milestones: 1.0.0, 1.1.0 Nov 25, 2016
@@ -584,6 +584,25 @@ func (err ErrPullRequestNotExist) Error() string {
err.ID, err.IssueID, err.HeadRepoID, err.BaseRepoID, err.HeadBarcnh, err.BaseBranch)
}

type ErrPullRequestAlreadyExists struct {
Copy link
Member

Choose a reason for hiding this comment

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

golint

@@ -0,0 +1,418 @@
// Copyright 2015 The Gogs Authors. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

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

comment :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Right, I'm not entirely sure if we can just change it, since I'm not the original author of this... @lstahlman is IIRC

@bkcsoft bkcsoft added type/feature Completely new functionality. Can only be merged if feature freeze is not active. and removed type/enhancement An improvement of existing functionality labels Nov 29, 2016
@bkcsoft bkcsoft force-pushed the api/pull-requests branch 3 times, most recently from 8b131af to 23e7ccc Compare December 1, 2016 09:41
@bkcsoft
Copy link
Member Author

bkcsoft commented Dec 1, 2016

There, fixed the things @lunny said, should be good for merging :)

@tboerger
Copy link
Member

tboerger commented Dec 1, 2016

LGTM

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 1, 2016
@Bwko
Copy link
Member

Bwko commented Dec 1, 2016

LGTM

@tboerger tboerger 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 Dec 1, 2016
@bkcsoft
Copy link
Member Author

bkcsoft commented Dec 2, 2016

Builds are failing because of Linting, Need to so some final testing before this goes into master though...

@bkcsoft bkcsoft added pr/wip This PR is not ready for review status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR labels Dec 2, 2016
@bkcsoft
Copy link
Member Author

bkcsoft commented Dec 2, 2016

Builds are green! 😄

@bkcsoft bkcsoft removed the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label Dec 2, 2016
@bkcsoft
Copy link
Member Author

bkcsoft commented Dec 2, 2016

Verified that it works using the (currently under development) Gitea-importer in GitLab :)

@bkcsoft bkcsoft force-pushed the api/pull-requests branch 2 times, most recently from 3d62890 to 4dbead0 Compare December 2, 2016 10:28
@strk
Copy link
Member

strk commented Dec 2, 2016

So drop the status/wip label ? :)

@bkcsoft
Copy link
Member Author

bkcsoft commented Dec 2, 2016

@strk since it was "Green" I tacked on the wip-label so no-one accidentally merged it 😛

@bkcsoft bkcsoft removed the pr/wip This PR is not ready for review label Dec 2, 2016
@bkcsoft bkcsoft merged commit 0f05470 into master Dec 2, 2016
@bkcsoft bkcsoft deleted the api/pull-requests branch December 2, 2016 11:10
@strk
Copy link
Member

strk commented Dec 2, 2016

Ops, an accident occurred !
(please change the Milestone back to 1.0.0, it will help generating the CHANGELOG...)

@tboerger tboerger modified the milestones: 1.0.0, 1.1.0 Dec 2, 2016
bkcsoft added a commit that referenced this pull request Dec 5, 2016
@bkcsoft bkcsoft mentioned this pull request Dec 5, 2016
bkcsoft added a commit that referenced this pull request Dec 5, 2016
* Fix #344 (regression in PR-API #248)
@lunny lunny added the modifies/api This PR adds API routes or modifies them label Jan 25, 2017
ethantkoenig added a commit to ethantkoenig/gitea that referenced this pull request Jan 27, 2018
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
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/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants