diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 918252044be6..32b51fd7c63b 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -1553,8 +1553,9 @@ LEVEL = Info ;; The source of the username for new oauth2 accounts: ;; userid = use the userid / sub attribute ;; nickname = use the nickname attribute +;; preferred_username = use the preferred_username attribute ;; email = use the username part of the email attribute -;; Note: `nickname` and `email` options will normalize input strings using the following criteria: +;; Note: `nickname`, `preferred_username` and `email` options will normalize input strings using the following criteria: ;; - diacritics are removed ;; - the characters in the set `['´\x60]` are removed ;; - the characters in the set `[\s~+]` are replaced with `-` diff --git a/docs/content/administration/config-cheat-sheet.en-us.md b/docs/content/administration/config-cheat-sheet.en-us.md index 9de7511964fc..ff8bcb066c41 100644 --- a/docs/content/administration/config-cheat-sheet.en-us.md +++ b/docs/content/administration/config-cheat-sheet.en-us.md @@ -608,9 +608,10 @@ And the following unique queues: - `ENABLE_AUTO_REGISTRATION`: **false**: Automatically create user accounts for new oauth2 users. - `USERNAME`: **nickname**: The source of the username for new oauth2 accounts: - `userid` - use the userid / sub attribute - - `nickname` - use the nickname attribute + - `nickname` - use the nickname + - `preferred_username` - use the preferred_username - `email` - use the username part of the email attribute - - Note: `nickname` and `email` options will normalize input strings using the following criteria: + - Note: `nickname`, `preferred_username` and `email` options will normalize input strings using the following criteria: - diacritics are removed - the characters in the set `['´\x60]` are removed - the characters in the set `[\s~+]` are replaced with `-` diff --git a/models/activities/action_list.go b/models/activities/action_list.go index 6e23b173b5ab..aafb7f8a26c5 100644 --- a/models/activities/action_list.go +++ b/models/activities/action_list.go @@ -83,6 +83,9 @@ func (actions ActionList) loadRepoOwner(ctx context.Context, userMap map[int64]* _, alreadyLoaded := userMap[action.Repo.OwnerID] return action.Repo.OwnerID, !alreadyLoaded }) + if len(missingUserIDs) == 0 { + return nil + } if err := db.GetEngine(ctx). In("id", missingUserIDs). @@ -129,6 +132,9 @@ func (actions ActionList) LoadComments(ctx context.Context) error { commentIDs = append(commentIDs, action.CommentID) } } + if len(commentIDs) == 0 { + return nil + } commentsMap := make(map[int64]*issues_model.Comment, len(commentIDs)) if err := db.GetEngine(ctx).In("id", commentIDs).Find(&commentsMap); err != nil { diff --git a/modules/setting/oauth2.go b/modules/setting/oauth2.go index 830472db32bf..6930197b22a7 100644 --- a/modules/setting/oauth2.go +++ b/modules/setting/oauth2.go @@ -22,11 +22,13 @@ const ( OAuth2UsernameNickname OAuth2UsernameType = "nickname" // OAuth2UsernameEmail username of oauth2 email field will be used as gitea name OAuth2UsernameEmail OAuth2UsernameType = "email" + // OAuth2UsernameEmail username of oauth2 preferred_username field will be used as gitea name + OAuth2UsernamePreferredUsername OAuth2UsernameType = "preferred_username" ) func (username OAuth2UsernameType) isValid() bool { switch username { - case OAuth2UsernameUserid, OAuth2UsernameNickname, OAuth2UsernameEmail: + case OAuth2UsernameUserid, OAuth2UsernameNickname, OAuth2UsernameEmail, OAuth2UsernamePreferredUsername: return true } return false diff --git a/modules/structs/repo_compare.go b/modules/structs/repo_compare.go new file mode 100644 index 000000000000..8a1249870511 --- /dev/null +++ b/modules/structs/repo_compare.go @@ -0,0 +1,10 @@ +// Copyright 2024 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package structs + +// Compare represents a comparison between two commits. +type Compare struct { + TotalCommits int `json:"total_commits"` // Total number of commits in the comparison. + Commits []*Commit `json:"commits"` // List of commits in the comparison. +} diff --git a/modules/structs/user.go b/modules/structs/user.go index 21ecc1479e2b..ca6ab7994463 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -20,6 +20,8 @@ type User struct { // the user's authentication sign-in name. // default: empty LoginName string `json:"login_name"` + // The ID of the user's Authentication Source + SourceID int64 `json:"source_id"` // the user's full name FullName string `json:"full_name"` // swagger:strfmt email diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 3e907eabfdcb..78460ad2f839 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -163,18 +163,23 @@ no_results_found=未找到结果 search=搜索... type_tooltip=搜索类型 fuzzy=模糊 +fuzzy_tooltip=包含近似匹配搜索词的结果 match=匹配 +match_tooltip=仅包含精确匹配搜索词的结果 repo_kind=搜索仓库... user_kind=搜索用户... org_kind=搜索组织... team_kind=搜索团队... code_kind=搜索代码... +code_search_unavailable=代码搜索当前不可用。请与网站管理员联系。 +code_search_by_git_grep=当前代码搜索结果由“git grep”提供。如果站点管理员启用仓库索引器，可能会有更好的结果。 package_kind=搜索软件包... project_kind=搜索项目... branch_kind=搜索分支... commit_kind=搜索提交记录... runner_kind=搜索runners... no_results=未找到匹配结果 +keyword_search_unavailable=按关键字搜索当前不可用。请联系站点管理员。 [aria] navbar=导航栏 @@ -281,6 +286,7 @@ email_title=电子邮箱设置 smtp_addr=SMTP 主机地址 smtp_port=SMTP 端口 smtp_from=电子邮件发件人 +smtp_from_invalid=`"发送电子邮件为"地址无效` smtp_from_helper=请输入一个用于 Gitea 的电子邮件地址，或者使用完整格式："名称" mailer_user=SMTP 用户名 mailer_password=SMTP 密码 @@ -389,6 +395,7 @@ forgot_password_title=忘记密码 forgot_password=忘记密码？ sign_up_now=还没帐户？马上注册。 sign_up_successful=帐户创建成功。欢迎！ +confirmation_mail_sent_prompt_ex=一封新的确认邮件已经发送到 %s请在下一个 %s 中检查您的收件箱以完成注册过程。 如果您的注册电子邮件地址不正确，您可以重新登录并更改它。 must_change_password=更新您的密码 allow_password_change=要求用户更改密码（推荐） reset_password_mail_sent_prompt=确认电子邮件已被发送到 %s。请您在 %s 内检查您的收件箱 ，完成密码重置过程。 @@ -398,6 +405,7 @@ prohibit_login=禁止登录 prohibit_login_desc=您的帐户被禁止登录，请与网站管理员联系。 resent_limit_prompt=您请求发送激活邮件过于频繁，请等待 3 分钟后再试！ has_unconfirmed_mail=%s 您好，系统检测到您有一封发送至 %s 但未被确认的邮件。如果您未收到激活邮件，或需要重新发送，请单击下方的按钮。 +change_unconfirmed_mail_address=如果您的注册电子邮件地址不正确，您可以在此更改并重新发送新的确认电子邮件。 resend_mail=单击此处重新发送确认邮件 email_not_associate=您输入的邮箱地址未被关联到任何帐号！ send_reset_mail=发送账户恢复邮件 @@ -578,6 +586,7 @@ team_name_been_taken=团队名称已被使用。 team_no_units_error=至少选择一项仓库单元。 email_been_used=该电子邮件地址已在使用中。 email_invalid=此邮箱地址无效。 +email_domain_is_not_allowed=用户 %s 与EMAIL_DOMAIN_ALLOWLIT 或 EMAIL_DOMAIN_BLOCKLIT 冲突。请确保您的操作是预期的。 openid_been_used=OpenID 地址 "%s" 已被使用。 username_password_incorrect=用户名或密码不正确。 password_complexity=密码未达到复杂程度要求: @@ -589,6 +598,8 @@ enterred_invalid_repo_name=输入的仓库名称不正确 enterred_invalid_org_name=您输入的组织名称不正确。 enterred_invalid_owner_name=新的所有者名称无效。 enterred_invalid_password=输入的密码不正确 +unset_password=登录用户没有设置密码。 +unsupported_login_type=此登录类型不支持手动删除帐户。 user_not_exist=该用户不存在 team_not_exist=团队不存在 last_org_owner=您不能从 "所有者" 团队中删除最后一个用户。组织中必须至少有一个所有者。 @@ -643,8 +654,24 @@ block.block.user=屏蔽用户 block.block.org=屏蔽用户访问组织 block.block.failure=屏蔽用户失败: %s block.unblock=取消屏蔽 +block.unblock.failure=屏蔽用户失败: %s +block.blocked=您已屏蔽此用户。 block.title=屏蔽一个用户 +block.info=屏蔽用户会阻止他们与仓库进行交互，例如打开或评论合并请求或出现问题。了解更多关于屏蔽用户的信息。 +block.info_1=阻止用户在您的帐户和仓库中进行以下操作： block.info_2=关注你的账号 +block.info_3=通过@提及您的用户名向您发送通知 +block.info_4=邀请您作为协作者到他们的仓库中 +block.info_5=在仓库中点赞、派生或关注 +block.info_6=打开和评论工单或合并请求 +block.info_7=在问题或合并请求中对您的评论做出反应 +block.user_to_block=要屏蔽的用户 +block.note=备注 +block.note.title=可选备注： +block.note.info=该备注对被屏蔽的用户不可见。 +block.note.edit=编辑备注 +block.list=已屏蔽用户 +block.list.none=您没有已屏蔽的用户。 [settings] profile=个人信息 @@ -982,7 +1009,9 @@ fork_visibility_helper=无法更改派生仓库的可见性。 fork_branch=要克隆到 Fork 的分支 all_branches=所有分支 fork_no_valid_owners=这个代码仓库无法被派生，因为没有有效的所有者。 +fork.blocked_user=无法克隆仓库，因为您被仓库所有者屏蔽。 use_template=使用此模板 +open_with_editor=用 %s 打开 download_zip=下载 ZIP download_tar=下载 TAR.GZ download_bundle=下载 BUNDLE @@ -1035,6 +1064,7 @@ watchers=关注者 stargazers=称赞者 stars_remove_warning=这将清除此仓库的所有点赞数。 forks=派生仓库 +stars=点赞数 reactions_more=再加载 %d unit_disabled=站点管理员已禁用此仓库单元。 language_other=其它 @@ -1156,6 +1186,7 @@ watch=关注 unstar=取消点赞 star=点赞 fork=派生 +action.blocked_user=无法执行操作，因为您已被仓库所有者屏蔽。 download_archive=下载此仓库 more_operations=更多操作 @@ -1202,6 +1233,8 @@ file_view_rendered=渲染模式 file_view_raw=查看原始文件 file_permalink=永久链接 file_too_large=文件过大，无法显示。 +code_preview_line_from_to=在 %[3]s 的第 %[1]d 行到 %[2]d 行 +code_preview_line_in=在 %[2]s 的第 %[1]d 行 invisible_runes_header=`此文件含有不可见的 Unicode 字符` invisible_runes_description=`此文件含有人类无法区分的不可见的 Unicode 字符，但可以由计算机进行不同的处理。 如果您是想特意这样的，可以安全地忽略该警告。 使用 Escape 按钮显示他们。` ambiguous_runes_header=`此文件含有模棱两可的 Unicode 字符` @@ -1284,6 +1317,8 @@ editor.file_editing_no_longer_exists=正在编辑的文件 %s 已不存在。 editor.file_deleting_no_longer_exists=正在删除的文件 %s 已不存在。 editor.file_changed_while_editing=文件内容在您进行编辑时已经发生变动。单击此处 查看变动的具体内容，或者 再次提交 覆盖已发生的变动。 editor.file_already_exists=此仓库已经存在名为 %s 的文件。 +editor.commit_id_not_matching=提交ID与您开始编辑时的ID不匹配。请提交到补丁分支然后合并。 +editor.push_out_of_date=推送似乎已经过时。 editor.commit_empty_file_header=提交一个空文件 editor.commit_empty_file_text=您要提交的文件是空的，继续吗？ editor.no_changes_to_show=没有可以显示的变更。 @@ -1402,6 +1437,8 @@ issues.new.assignees=指派成员 issues.new.clear_assignees=取消指派成员 issues.new.no_assignees=未指派成员 issues.new.no_reviewers=无审核者 +issues.new.blocked_user=无法创建工单，因为您已被仓库所有者屏蔽。 +issues.edit.blocked_user=无法编辑内容，因为您已被仓库所有者或工单创建者屏蔽。 issues.choose.get_started=开始 issues.choose.open_external_link=开启 issues.choose.blank=默认模板 @@ -1516,6 +1553,7 @@ issues.close_comment_issue=评论并关闭 issues.reopen_issue=重新开启 issues.reopen_comment_issue=评论并重新开启 issues.create_comment=评论 +issues.comment.blocked_user=无法创建或编辑评论，因为您已被仓库所有者或工单创建者屏蔽。 issues.closed_at=`于 %[2]s 关闭此工单` issues.reopened_at=`重新打开此问题 %[2]s` issues.commit_ref_at=`于 %[2]s 在代码提交中引用了该工单` @@ -1714,6 +1752,7 @@ compare.compare_head=比较 pulls.desc=启用合并请求和代码评审。 pulls.new=创建合并请求 +pulls.new.blocked_user=无法创建合并请求，因为您已被仓库所有者屏蔽。 pulls.view=查看拉取请求 pulls.compare_changes=创建合并请求 pulls.allow_edits_from_maintainers=允许维护者编辑 @@ -1797,6 +1836,7 @@ pulls.merge_pull_request=创建合并提交 pulls.rebase_merge_pull_request=变基后快进 pulls.rebase_merge_commit_pull_request=变基后创建合并提交 pulls.squash_merge_pull_request=创建压缩提交 +pulls.fast_forward_only_merge_pull_request=仅快进 pulls.merge_manually=手动合并 pulls.merge_commit_id=合并提交 ID pulls.require_signed_wont_sign=分支需要签名的提交，但这个合并将不会被签名 @@ -1933,6 +1973,7 @@ wiki.page_name_desc=输入此 Wiki 页面的名称。特殊名称有：'Home', ' wiki.original_git_entry_tooltip=查看原始的 Git 文件而不是使用友好链接。 activity=动态 +activity.navbar.pulse=活动 activity.navbar.code_frequency=代码频率 activity.navbar.contributors=贡献者 activity.navbar.recent_commits=最近的提交 diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 87a5b28fad0a..be907805d60f 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -30,7 +30,7 @@ import ( user_service "code.gitea.io/gitea/services/user" ) -func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64, loginName string) { +func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64) { if sourceID == 0 { return } @@ -47,7 +47,6 @@ func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64 u.LoginType = source.Type u.LoginSource = source.ID - u.LoginName = loginName } // CreateUser create a user @@ -83,12 +82,13 @@ func CreateUser(ctx *context.APIContext) { Passwd: form.Password, MustChangePassword: true, LoginType: auth.Plain, + LoginName: form.LoginName, } if form.MustChangePassword != nil { u.MustChangePassword = *form.MustChangePassword } - parseAuthSource(ctx, u, form.SourceID, form.LoginName) + parseAuthSource(ctx, u, form.SourceID) if ctx.Written() { return } diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index e870378c4b24..1fc768296685 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -1066,6 +1066,8 @@ func Routes() *web.Route { m.Post("/migrate", reqToken(), bind(api.MigrateRepoOptions{}), repo.Migrate) m.Group("/{username}/{reponame}", func() { + m.Get("/compare/*", reqRepoReader(unit.TypeCode), repo.CompareDiff) + m.Combo("").Get(reqAnyRepoReader(), repo.Get). Delete(reqToken(), reqOwner(), repo.Delete). Patch(reqToken(), reqAdmin(), bind(api.EditRepoOption{}), repo.Edit) diff --git a/routers/api/v1/repo/compare.go b/routers/api/v1/repo/compare.go new file mode 100644 index 000000000000..549b9b7fa91e --- /dev/null +++ b/routers/api/v1/repo/compare.go @@ -0,0 +1,99 @@ +// Copyright 2024 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package repo + +import ( + "net/http" + "strings" + + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/gitrepo" + api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/services/context" + "code.gitea.io/gitea/services/convert" +) + +// CompareDiff compare two branches or commits +func CompareDiff(ctx *context.APIContext) { + // swagger:operation GET /repos/{owner}/{repo}/compare/{basehead} Get commit comparison information + // --- + // summary: Get commit comparison information + // produces: + // - application/json + // parameters: + // - name: owner + // in: path + // description: owner of the repo + // type: string + // required: true + // - name: repo + // in: path + // description: name of the repo + // type: string + // required: true + // - name: basehead + // in: path + // description: compare two branches or commits + // type: string + // required: true + // responses: + // "200": + // "$ref": "#/responses/Compare" + // "404": + // "$ref": "#/responses/notFound" + + if ctx.Repo.GitRepo == nil { + gitRepo, err := gitrepo.OpenRepository(ctx, ctx.Repo.Repository) + if err != nil { + ctx.Error(http.StatusInternalServerError, "OpenRepository", err) + return + } + ctx.Repo.GitRepo = gitRepo + defer gitRepo.Close() + } + + infoPath := ctx.Params("*") + infos := []string{ctx.Repo.Repository.DefaultBranch, ctx.Repo.Repository.DefaultBranch} + if infoPath != "" { + infos = strings.SplitN(infoPath, "...", 2) + if len(infos) != 2 { + if infos = strings.SplitN(infoPath, "..", 2); len(infos) != 2 { + infos = []string{ctx.Repo.Repository.DefaultBranch, infoPath} + } + } + } + + _, _, headGitRepo, ci, _, _ := parseCompareInfo(ctx, api.CreatePullRequestOption{ + Base: infos[0], + Head: infos[1], + }) + if ctx.Written() { + return + } + defer headGitRepo.Close() + + verification := ctx.FormString("verification") == "" || ctx.FormBool("verification") + files := ctx.FormString("files") == "" || ctx.FormBool("files") + + apiCommits := make([]*api.Commit, 0, len(ci.Commits)) + userCache := make(map[string]*user_model.User) + for i := 0; i < len(ci.Commits); i++ { + apiCommit, err := convert.ToCommit(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, ci.Commits[i], userCache, + convert.ToCommitOptions{ + Stat: true, + Verification: verification, + Files: files, + }) + if err != nil { + ctx.ServerError("toCommit", err) + return + } + apiCommits = append(apiCommits, apiCommit) + } + + ctx.JSON(http.StatusOK, &api.Compare{ + TotalCommits: len(ci.Commits), + Commits: apiCommits, + }) +} diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go index 3e23aa4d5a5a..c3219f28d6a8 100644 --- a/routers/api/v1/swagger/repo.go +++ b/routers/api/v1/swagger/repo.go @@ -414,3 +414,9 @@ type swaggerRepoNewIssuePinsAllowed struct { // in:body Body api.NewIssuePinsAllowed `json:"body"` } + +// swagger:response Compare +type swaggerCompare struct { + // in:body + Body api.Compare `json:"body"` +} diff --git a/routers/common/compare.go b/routers/common/compare.go new file mode 100644 index 000000000000..4d1cc2f0d890 --- /dev/null +++ b/routers/common/compare.go @@ -0,0 +1,21 @@ +// Copyright 2024 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package common + +import ( + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/git" +) + +// CompareInfo represents the collected results from ParseCompareInfo +type CompareInfo struct { + HeadUser *user_model.User + HeadRepo *repo_model.Repository + HeadGitRepo *git.Repository + CompareInfo *git.CompareInfo + BaseBranch string + HeadBranch string + DirectComparison bool +} diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go index 8b5cd986b81a..9ef32ebdb13c 100644 --- a/routers/web/auth/auth.go +++ b/routers/web/auth/auth.go @@ -386,6 +386,13 @@ func getUserName(gothUser *goth.User) (string, error) { switch setting.OAuth2Client.Username { case setting.OAuth2UsernameEmail: return user_model.NormalizeUserName(strings.Split(gothUser.Email, "@")[0]) + case setting.OAuth2UsernamePreferredUsername: + preferredUsername, exists := gothUser.RawData["preferred_username"] + if exists { + return user_model.NormalizeUserName(preferredUsername.(string)) + } else { + return "", fmt.Errorf("preferred_username is missing in received user data but configured as username source for user_id %q. Check if OPENID_CONNECT_SCOPES contains profile", gothUser.UserID) + } case setting.OAuth2UsernameNickname: return user_model.NormalizeUserName(gothUser.NickName) default: // OAuth2UsernameUserid diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index cfb0e859bd7c..035a92f22830 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -35,6 +35,7 @@ import ( api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/typesniffer" "code.gitea.io/gitea/modules/util" + "code.gitea.io/gitea/routers/common" "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/context/upload" "code.gitea.io/gitea/services/gitdiff" @@ -185,21 +186,10 @@ func setCsvCompareContext(ctx *context.Context) { } } -// CompareInfo represents the collected results from ParseCompareInfo -type CompareInfo struct { - HeadUser *user_model.User - HeadRepo *repo_model.Repository - HeadGitRepo *git.Repository - CompareInfo *git.CompareInfo - BaseBranch string - HeadBranch string - DirectComparison bool -} - // ParseCompareInfo parse compare info between two commit for preparing comparing references -func ParseCompareInfo(ctx *context.Context) *CompareInfo { +func ParseCompareInfo(ctx *context.Context) *common.CompareInfo { baseRepo := ctx.Repo.Repository - ci := &CompareInfo{} + ci := &common.CompareInfo{} fileOnly := ctx.FormBool("file-only") @@ -576,7 +566,7 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo { // PrepareCompareDiff renders compare diff page func PrepareCompareDiff( ctx *context.Context, - ci *CompareInfo, + ci *common.CompareInfo, whitespaceBehavior git.TrustedCmdArgs, ) bool { var ( diff --git a/services/convert/user.go b/services/convert/user.go index 3521dd2f905c..1a2733d91e63 100644 --- a/services/convert/user.go +++ b/services/convert/user.go @@ -75,6 +75,7 @@ func toUser(ctx context.Context, user *user_model.User, signed, authed bool) *ap if authed { result.IsAdmin = user.IsAdmin result.LoginName = user.LoginName + result.SourceID = user.LoginSource result.LastLogin = user.LastLoginUnix.AsTime() result.Language = user.Language result.IsActive = user.IsActive diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 6c2e08a98579..7b39830df808 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -71,7 +71,7 @@ {{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
+ {{end}} {{end}} diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index b8ac9a619419..ed0d58cf2758 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -5,9 +5,9 @@ {{$.CsrfTokenHtml}} {{/* TODO: share this branch selector dropdown with the same in repo page */}} -
+
- {{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}} + {{if .Reference}}{{$.RefEndName}}{{else}}{{ctx.Locale.Tr "repo.issues.no_ref"}}{{end}} {{if .HasIssuesOrPullsWritePermission}}{{svg "octicon-triangle-down" 14 "dropdown icon"}}{{end}}
@@ -37,7 +37,7 @@
{{ctx.Locale.Tr "repo.clear_ref"}}
{{end}} {{range .Branches}} -
{{.}}
+
{{.}}
{{else}}
{{ctx.Locale.Tr "no_results_found"}}
{{end}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index b78ff55cda0f..fccf8cca9141 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -41,7 +41,7 @@ {{else}}
{{svg "octicon-issue-opened"}} {{ctx.Locale.Tr "repo.issues.open_title"}}
{{end}} -
+
{{if .Issue.IsPull}} {{$headHref := .HeadTarget}} {{if .HeadBranchLink}} diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl index 1cdb98bf2721..0f09d8b4925a 100644 --- a/templates/repo/star_unstar.tmpl +++ b/templates/repo/star_unstar.tmpl @@ -4,7 +4,7 @@ {{if $.IsStaringRepo}}{{$buttonText = ctx.Locale.Tr "repo.unstar"}}{{end}} {{CountFmt .Repository.NumStars}} diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl index 64be97141666..465cd91c2b37 100644 --- a/templates/repo/watch_unwatch.tmpl +++ b/templates/repo/watch_unwatch.tmpl @@ -4,7 +4,7 @@ {{if $.IsWatchingRepo}}{{$buttonText = ctx.Locale.Tr "repo.unwatch"}}{{end}} {{CountFmt .Repository.NumWatches}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 1c0dfcc5511e..16c650ee3e45 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -88,18 +88,21 @@
{{end}} {{if and .Milestone (ne $.listType "milestone")}} - - {{svg "octicon-milestone" 14}}{{.Milestone.Name}} + + {{svg "octicon-milestone" 14}} + {{.Milestone.Name}} {{end}} {{if .Project}} - - {{svg .Project.IconName 14}}{{.Project.Title}} + + {{svg .Project.IconName 14}} + {{.Project.Title}} {{end}} {{if .Ref}} - - {{svg "octicon-git-branch" 14}}{{index $.IssueRefEndNames .ID}} + + {{svg "octicon-git-branch" 14}} + {{index $.IssueRefEndNames .ID}} {{end}} {{$tasks := .GetTasks}} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index b5677c77e03c..532b8880bc82 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -5340,6 +5340,51 @@ } } }, + "/repos/{owner}/{repo}/compare/{basehead}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "Get", + "commit", + "comparison" + ], + "summary": "Get commit comparison information", + "operationId": "information", + "parameters": [ + { + "type": "string", + "description": "owner of the repo", + "name": "owner", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "name of the repo", + "name": "repo", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "compare two branches or commits", + "name": "basehead", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "$ref": "#/responses/Compare" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + } + }, "/repos/{owner}/{repo}/contents": { "get": { "produces": [ @@ -18717,6 +18762,25 @@ }, "x-go-package": "code.gitea.io/gitea/modules/structs" }, + "Compare": { + "type": "object", + "title": "Compare represents a comparison between two commits.", + "properties": { + "commits": { + "type": "array", + "items": { + "$ref": "#/definitions/Commit" + }, + "x-go-name": "Commits" + }, + "total_commits": { + "type": "integer", + "format": "int64", + "x-go-name": "TotalCommits" + } + }, + "x-go-package": "code.gitea.io/gitea/modules/structs" + }, "ContentsResponse": { "description": "ContentsResponse contains information about a repo's entry's (dir, file, symlink, submodule) metadata and content", "type": "object", @@ -24196,6 +24260,12 @@ "type": "boolean", "x-go-name": "Restricted" }, + "source_id": { + "description": "The ID of the user's Authentication Source", + "type": "integer", + "format": "int64", + "x-go-name": "SourceID" + }, "starred_repos_count": { "type": "integer", "format": "int64", @@ -24678,6 +24748,12 @@ } } }, + "Compare": { + "description": "", + "schema": { + "$ref": "#/definitions/Compare" + } + }, "ContentsListResponse": { "description": "ContentsListResponse", "schema": { diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go new file mode 100644 index 000000000000..f3188eb49f62 --- /dev/null +++ b/tests/integration/api_repo_compare_test.go @@ -0,0 +1,38 @@ +// Copyright 2024 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package integration + +import ( + "net/http" + "testing" + + auth_model "code.gitea.io/gitea/models/auth" + "code.gitea.io/gitea/models/unittest" + user_model "code.gitea.io/gitea/models/user" + api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/tests" + + "github.com/stretchr/testify/assert" +) + +func TestAPICompareBranches(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + // Login as User2. + session := loginUser(t, user.Name) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + + repoName := "repo20" + + req := NewRequestf(t, "GET", "/api/v1/repos/user2/%s/compare/add-csv...remove-files-b", repoName). + AddTokenAuth(token) + resp := MakeRequest(t, req, http.StatusOK) + + var apiResp *api.Compare + DecodeJSON(t, resp, &apiResp) + + assert.Equal(t, 2, apiResp.TotalCommits) + assert.Len(t, apiResp.Commits, 2) +} diff --git a/web_src/css/base.css b/web_src/css/base.css index 8ded4aa88342..7e781aa97b78 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -342,6 +342,8 @@ a.label, .ui.dropdown .menu > .item { color: var(--color-text); + overflow: hidden; + text-overflow: ellipsis; } .ui.dropdown .menu > .item:hover { diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css index 87b9ddf292d0..4e133852f1cc 100644 --- a/web_src/css/modules/button.css +++ b/web_src/css/modules/button.css @@ -63,6 +63,8 @@ } .ui.labeled.button > .button { margin: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } .ui.labeled.button > .label { display: flex; @@ -70,6 +72,14 @@ margin: 0 0 0 -1px !important; font-size: 1em; border-color: var(--color-light-border); + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} +.ui.labeled.button > .label:hover { + background: var(--color-hover); +} +.ui.labeled.button > .button:hover + .label { + border-left-color: var(--color-secondary-dark-2); } .ui.button > .icon:not(.button) { diff --git a/web_src/css/modules/checkbox.css b/web_src/css/modules/checkbox.css index d3e45714a4dd..8d73573bfafc 100644 --- a/web_src/css/modules/checkbox.css +++ b/web_src/css/modules/checkbox.css @@ -66,7 +66,7 @@ input[type="radio"] { } .ui.toggle.checkbox input { width: 3.5rem; - height: 1.5rem; + height: 21px; opacity: 0; z-index: 3; } @@ -81,29 +81,30 @@ input[type="radio"] { content: ""; z-index: 1; top: 0; - width: 3.5rem; - height: 1.5rem; + width: 49px; + height: 21px; border-radius: 500rem; left: 0; } .ui.toggle.checkbox label::after { background: var(--color-white); + box-shadow: 1px 1px 4px 1px var(--color-shadow); position: absolute; content: ""; opacity: 1; z-index: 2; - width: 1.5rem; - height: 1.5rem; - top: 0; - left: 0; + width: 18px; + height: 18px; + top: 1.5px; + left: 1.5px; border-radius: 500rem; transition: background 0.3s ease, left 0.3s ease; } .ui.toggle.checkbox input ~ label::after { - left: -0.05rem; + left: 1.5px; } .ui.toggle.checkbox input:checked ~ label::after { - left: 2.15rem; + left: 29px; } .ui.toggle.checkbox input:focus ~ label::before, .ui.toggle.checkbox label::before { diff --git a/web_src/css/modules/label.css b/web_src/css/modules/label.css index 2032b2c84bbb..1e42668aa1a2 100644 --- a/web_src/css/modules/label.css +++ b/web_src/css/modules/label.css @@ -107,7 +107,7 @@ a.ui.label:hover { a.ui.basic.label:hover { text-decoration: none; color: var(--color-text); - border-color: var(--color-light-border); + border-color: var(--color-secondary-dark-2); background: var(--color-hover); } diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 0f6bf482b5db..8d1f60d15876 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -50,6 +50,11 @@ width: 300px; } +.issue-content-right .dropdown > .menu { + max-width: 270px; + min-width: 0; +} + @media (max-width: 767.98px) { .issue-content-left, .issue-content-right { @@ -57,11 +62,6 @@ } } -.repository .issue-content-right .menu { - overflow-x: auto; - max-height: 500px; -} - .repository .issue-content-right .ui.list .dependency { padding: 0; white-space: nowrap; @@ -113,11 +113,6 @@ left: 0; } -.repository .filter.menu .ui.dropdown .menu .item { - overflow: hidden; - text-overflow: ellipsis; -} - .repository .select-label .desc { padding-left: 23px; } @@ -672,6 +667,7 @@ td .commit-summary { font-size: 14px !important; padding: 7px 10px !important; border-radius: var(--border-radius-medium) !important; + flex-shrink: 0; } .issue-state-label .svg { @@ -1170,10 +1166,6 @@ td .commit-summary { font-size: 14px; } -.repository .ui.dropdown.filter > .menu { - margin-top: 1px; -} - .repository.branches .commit-divergence .bar-group { position: relative; float: left; diff --git a/web_src/css/repo/header.css b/web_src/css/repo/header.css index 55e704ed10be..b70691435f59 100644 --- a/web_src/css/repo/header.css +++ b/web_src/css/repo/header.css @@ -36,11 +36,6 @@ gap: 0.25em; } -.repo-buttons .ui.labeled.button > .label:hover { - color: var(--color-primary-light-2); - background: var(--color-light); -} - .repo-buttons button[disabled] ~ .label { opacity: var(--opacity-disabled); color: var(--color-text-dark); @@ -67,3 +62,12 @@ .repo-buttons .ui.labeled.button.disabled > .button { pointer-events: none !important; } + +@media (max-width: 767.98px) { + .repo-buttons .ui.button, + .repo-buttons .ui.label { + padding-left: 8px; + padding-right: 8px; + margin: 0; + } +} diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 77905956f0e5..1e0f82ce276c 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -39,7 +39,7 @@ } #issue-list .flex-item-body .branches .branch { - background-color: var(--color-secondary-alpha-40); + background-color: var(--color-secondary-alpha-50); border-radius: var(--border-radius); padding: 0 4px; } @@ -48,7 +48,9 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - max-width: 10em; + max-width: 200px; + display: inline-block; + vertical-align: top; } #issue-list .flex-item-body .checklist progress { diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index 4e977ab185d1..c13af14deabb 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -248,12 +248,12 @@ export default sfc; // activate IDE's Vue plugin