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

Add member, collaborator, contributor, and first-time contributor roles and tooltips #26658

Merged
merged 24 commits into from Aug 24, 2023
Merged

Add member, collaborator, contributor, and first-time contributor roles and tooltips #26658

merged 24 commits into from Aug 24, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Aug 22, 2023

GitHub like role descriptor
image
image
image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 22, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 22, 2023
@lunny lunny added the type/enhancement An improvement of existing functionality label Aug 22, 2023
@lunny lunny added this to the 1.21.0 milestone Aug 22, 2023
delvh
delvh reviewed Aug 22, 2023
View reviewed changes
models/issues/comment.go Outdated Show resolved Hide resolved
routers/web/repo/issue.go Outdated Show resolved Hide resolved
options/locale/locale_en-US.ini
Comment on lines +1483 to +1484
issues.author = Author
issues.author_helper = This user is the author.
Copy link
Member

Choose a reason for hiding this comment

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

Where do we even assign author?
I haven't found it inside roleDescriptor…

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In Gitea, it is called poster.

options/locale/locale_en-US.ini Outdated Show resolved Hide resolved
options/locale/locale_en-US.ini Outdated Show resolved Hide resolved
templates/repo/issue/view_content/show_role.tmpl Outdated Show resolved Hide resolved
@delvh delvh changed the title Improve role descriptor Add member, collaborator, contributor, and first-time contributor roles and tooltips Aug 22, 2023
yp05327 and others added 5 commits August 23, 2023 01:25
@yp05327
fix
02147a4
@yp05327 @delvh
Update options/locale/locale_en-US.ini
d9d1189 
Co-authored-by: delvh <dev.lh@web.de>
@yp05327 @delvh
Update options/locale/locale_en-US.ini
40335f1 
Co-authored-by: delvh <dev.lh@web.de>
@yp05327
change the logic of
04d89a0 
detecting first time contributor
@yp05327
rewrite stringToRoleDescriptor
47376c8
wxiaoguang
wxiaoguang reviewed Aug 23, 2023
View reviewed changes
models/issues/comment.go Outdated Show resolved Hide resolved
models/issues/comment.go Outdated Show resolved Hide resolved
models/issues/comment.go Outdated Show resolved Hide resolved
models/issues/comment.go Outdated Show resolved Hide resolved
@GiteaBot GiteaBot 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 Aug 23, 2023
lunny
lunny reviewed Aug 23, 2023
View reviewed changes
routers/web/repo/issue.go Outdated Show resolved Hide resolved
@yp05327
Copy link
Contributor Author

yp05327 commented Aug 23, 2023

@wxiaoguang
some changes in cbf0c31 are not correct

@yp05327
Copy link
Contributor Author

yp05327 commented Aug 23, 2023

image

@wxiaoguang
Copy link
Contributor

See 67cbdad

@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 Aug 23, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 23, 2023
@lunny lunny enabled auto-merge (squash) August 24, 2023 01:09
@lunny lunny merged commit d2e4039 into go-gitea:main Aug 24, 2023
23 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 24, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 25, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
9a3215d 
* giteaofficial/main:
  Fix review bar misalignment (go-gitea#26711)
  Use "small-loading-icon" insead of "btn-octicon is-loading" (go-gitea#26710)
  Improve Image Diff UI (go-gitea#26696)
  Make issue template field template access correct template data (go-gitea#26698)
  add Upload URL to release API (go-gitea#26663)
  Add merge files files to GetCommitFileStatus (go-gitea#20515)
  PATCH branch-protection updates check list even when checks are disabled (go-gitea#26351)
  Add `member`, `collaborator`, `contributor`, and `first-time contributor` roles and tooltips (go-gitea#26658)
  chore(actions): support cron schedule task (go-gitea#26655)
@yp05327 yp05327 deleted the refact-role-descriptor branch August 28, 2023 00:42
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@lunny lunny lunny approved these changes

@delvh delvh delvh 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@yp05327 @wxiaoguang @lunny @delvh @GiteaBot