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

ui: Add MergePull comment type instead of close for merge PR #11058

Merged
merged 2 commits into from
Apr 14, 2020
Merged

ui: Add MergePull comment type instead of close for merge PR #11058

merged 2 commits into from
Apr 14, 2020

Conversation

a1012112796
Copy link
Member

As title.

view:
jtng

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 13, 2020
@lafriks lafriks added the type/enhancement An improvement of existing functionality label Apr 13, 2020
@lafriks lafriks added this to the 1.12.0 milestone Apr 13, 2020
@guillep2k
Copy link
Member

Have you checked actionToTemplate() in services/mailer/mail.go? At first glance it shouldn't need any changes; asking just in case.

@a1012112796
Copy link
Member Author

Have you checked actionToTemplate() in services/mailer/mail.go? At first glance it shouldn't need any changes; asking just in case.

Hello, I think this change only about comment, it haven't do any change on notify and actions.
so it will't be influenced.

@guillep2k
Copy link
Member

Hello, I think this change only about comment, it haven't do any change on notify and actions.
so it will't be influenced.

Every time you create a comment, a notification is derived from that comment; and comment types (you've just added one) are important for the mail template system.

I don't expect a problem in this case, but it doesn't hurt to check.

@6543

This comment has been minimized.

Sign in to view
@6543
Copy link
Member

6543 commented Apr 13, 2020

OK ... to track when it was merged if the conversation in a pull goes on

@6543
Copy link
Member

6543 commented Apr 13, 2020

lgtm bot ?

@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 Apr 13, 2020
@lunny
Copy link
Member

lunny commented Apr 14, 2020

make L-G-T-M work

@lunny lunny merged commit 2810295 into go-gitea:master Apr 14, 2020
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
@a1012112796 @lafriks
ui: Add MergePull comment type instead of close for merge PR (go-gite…
78f3a15 
…a#11058)

Signed-off-by: a1012112796 <[email protected]>

Co-authored-by: Lauris BH <[email protected]>
@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

@lunny lunny lunny approved these changes

@lafriks lafriks lafriks approved these changes

@6543 6543 6543 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@a1012112796 @guillep2k @6543 @lunny @lafriks @GiteaBot