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

Fix webhook type conflation. #4285

Merged
merged 2 commits into from
Jun 21, 2018
Merged

Fix webhook type conflation. #4285

merged 2 commits into from
Jun 21, 2018

Conversation

aunger
Copy link
Contributor

@aunger aunger commented Jun 20, 2018

  1. Fix typo that caused Gogs hooks to be created as Gitea hooks.
  2. Fix typo that caused Gogs hooks to be duplicated upon edit (though this bug was masked by the previous one).

@aunger
Fix webhook type conflation.
60d330d 
- Fix typo that caused Gogs hooks to be created as Gitea hooks.
- Fix typo that caused Gogs hooks to be duplicated upon edit (though this bug was masked by the previous one).

Signed-off-by: Russell Aunger <rba@live.com>
@aunger
Copy link
Contributor Author

aunger commented Jun 20, 2018

I think the drone test failed during Docker setup, unrelated to this change. Can someone rerun it?

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 20, 2018
@daviian
Copy link
Member

daviian commented Jun 20, 2018

Done

@codecov-io
Copy link

codecov-io commented Jun 20, 2018 •
edited
Loading

Codecov Report

Merging #4285 into master will increase coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4285      +/-   ##
==========================================
+ Coverage      20%   20.01%   +<.01%     
==========================================
  Files         153      153              
  Lines       30584    30584              
==========================================
+ Hits         6119     6122       +3     
+ Misses      23537    23535       -2     
+ Partials      928      927       -1
Impacted Files Coverage Δ
routers/repo/webhook.go 0% <0%> (ø) ⬆️
modules/process/manager.go 73.91% <0%> (+4.34%) ⬆️

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 ac110d1...1affced. Read the comment docs.

@lunny lunny added the type/bug label Jun 21, 2018
@lunny lunny added this to the 1.5.0 milestone Jun 21, 2018
@lunny
Copy link
Member

lunny commented Jun 21, 2018

LGTM

@bkcsoft bkcsoft 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 Jun 21, 2018
@bkcsoft bkcsoft 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 Jun 21, 2018
@daviian daviian merged commit 9ae7664 into go-gitea:master Jun 21, 2018
@daviian
Copy link
Member

daviian commented Jun 21, 2018

@aunger Please create a backport PR (cherry-pick commit from master) to release/v1.4 branch

@lunny
Copy link
Member

lunny commented Jun 21, 2018

@aunger please send a backport to release/v1.4

aunger added a commit to aunger/gitea that referenced this pull request Jun 21, 2018
@aunger
Fix webhook type conflation. (go-gitea#4285)
81a68cb 
- Fix typo that caused Gogs hooks to be created as Gitea hooks.
- Fix typo that caused Gogs hooks to be duplicated upon edit (though this bug was masked by the previous one).

Signed-off-by: Russell Aunger <rba@live.com>
@aunger aunger mentioned this pull request Jun 21, 2018
Merged
@lafriks lafriks added the backport/done All backports for this PR have been created label Jun 21, 2018
daviian pushed a commit that referenced this pull request Jun 21, 2018
@aunger @daviian
Fix webhook type conflation. (#4285) (#4289)
a3b1053 
- Fix typo that caused Gogs hooks to be created as Gitea hooks.
- Fix typo that caused Gogs hooks to be duplicated upon edit (though this bug was masked by the previous one).

Signed-off-by: Russell Aunger <rba@live.com>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

Assignees
No one assigned
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. type/bug
Projects
None yet
Milestone
1.5.0
Development

Successfully merging this pull request may close these issues.
6 participants
@aunger @daviian @codecov-io @lunny @lafriks @bkcsoft