1
1
mirror of https://github.com/go-gitea/gitea synced 2024-09-27 06:44:06 +00:00
gitea/models
zeripath 319c92163f Branches not at ref commit ID should not be listed as Merged (#9614) (#9639)
Once a branch has been merged if the commit ID no longer equals that of
the pulls ref commit id don't offer to delete the branch on the pull screen
and don't list it as merged on branches.

Fix #9201

When looking at the pull page we should also get the commits from the refs/pulls/x/head

Fix #9158
2020-01-08 03:06:53 +02:00
..
fixtures [Backport] [API] Allow only specific Colums to be updated on Issue (#9539) (#9580) 2020-01-02 02:38:42 -05:00
migrations Add Close() method to gogitRepository (#8901) (#8956) 2019-11-13 13:54:04 +00:00
access_test.go Fixed ineffectual assignments in tests (#7553) 2019-07-22 15:11:16 +08:00
access.go Trace Logging on Permission Denied & ColorFormat (#6618) 2019-04-22 23:40:51 +03:00
action_list.go refactor: reduce sql query in retrieveFeeds (#3547) 2018-02-21 18:55:34 +08:00
action_test.go Fix permission checks for close/reopen from commit (#8875) (#9033) 2019-11-16 00:11:40 +02:00
action.go Fix permission checks for close/reopen from commit (#8875) (#9033) 2019-11-16 00:11:40 +02:00
admin_test.go Fix tests code to prevent some runtime errors (#2381) 2017-08-28 12:17:45 +03:00
admin.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
attachment_test.go fix upload attachments (#6481) 2019-04-02 15:25:05 -04:00
attachment.go Extract actions on deletereleasebyid from models to release service (#8219) 2019-10-01 00:10:00 +08:00
branches_test.go Add deleted_branch table fixture (#2832) 2017-11-04 15:31:59 +02:00
branches.go Fix deleted branch isn't removed when push the branch again (#9516) (#9524) 2019-12-28 12:41:41 +08:00
commit_status_test.go api: fix multiple bugs with statuses endpoints (#7785) 2019-08-09 10:13:03 +08:00
commit_status.go Refuse merge until all required status checks success (#7481) 2019-09-18 08:39:45 +03:00
consistency.go Fix error log when loading issues caused by a xorm bug (#7271) 2019-06-23 18:22:43 +03:00
context.go Move all mail related codes from models to services/mailer (#7200) 2019-09-24 13:02:49 +08:00
convert.go Move database settings from models to setting (#7806) 2019-08-24 11:24:45 +02:00
error_oauth2.go gofmt (#1662) 2017-05-04 13:54:56 +08:00
error.go backport part of #9550 (#9564) 2019-12-31 19:00:17 +02:00
external_login_user.go Allow externalID to be UUID (#8551) (#8624) 2019-10-22 09:12:10 +01:00
gpg_key_test.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
gpg_key.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
graph_test.go Add Close() method to gogitRepository (#8901) (#8956) 2019-11-13 13:54:04 +00:00
graph.go move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364) 2019-03-27 17:33:00 +08:00
helper_directory.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
helper_environment.go Fix bug create/edit wiki pages when code master branch protected (#7580) 2019-07-25 22:50:20 +01:00
helper.go Add reactions to issues/PR and comments (#2856) 2017-12-04 01:14:26 +02:00
issue_assignees_test.go refactor: append, build variable and type switch (#4940) 2019-05-28 23:45:54 +08:00
issue_assignees.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
issue_comment_list.go Add golangci (#6418) 2019-06-12 15:41:28 -04:00
issue_comment_test.go Pull request review/approval and comment on code (#3748) 2018-08-06 06:43:21 +02:00
issue_comment.go Hotfix for review actions and notifications (#8965) 2019-11-14 00:38:12 +00:00
issue_dependency_test.go Fix an error while adding a dependency via UI. (#5862) 2019-01-27 13:31:40 +02:00
issue_dependency.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
issue_label_test.go Fix label count (#8267) 2019-09-24 21:22:39 +08:00
issue_label.go Fix label count (#8267) 2019-09-24 21:22:39 +08:00
issue_list_test.go Shows total tracked time in issue and milestone list (#3341) 2018-04-29 13:58:47 +08:00
issue_list.go Fix error log when loading issues caused by a xorm bug (#7271) 2019-06-23 18:22:43 +03:00
issue_lock.go Move change issue title from models to issue service package (#8456) 2019-10-11 14:44:43 +08:00
issue_milestone_test.go Fix milestone num_issues (#8221) 2019-10-06 17:26:19 -04:00
issue_milestone.go [Fix] milestone close timestamp (#8728) (#8730) 2019-10-29 03:11:24 +00:00
issue_reaction_test.go backport part of #9550 (#9564) 2019-12-31 19:00:17 +02:00
issue_reaction.go backport part of #9550 (#9564) 2019-12-31 19:00:17 +02:00
issue_stopwatch_test.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
issue_stopwatch.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
issue_test.go Move change issue title from models to issue service package (#8456) 2019-10-11 14:44:43 +08:00
issue_tracked_time_test.go Feature: Timetracking (#2211) 2017-09-12 09:48:13 +03:00
issue_tracked_time.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
issue_user_test.go Move all mail related codes from models to services/mailer (#7200) 2019-09-24 13:02:49 +08:00
issue_user.go Move all mail related codes from models to services/mailer (#7200) 2019-09-24 13:02:49 +08:00
issue_watch_test.go Hide unactive on explore users and some refactors (#2741) 2017-10-24 20:36:19 +03:00
issue_watch.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
issue_xref.go Rewrite reference processing code in preparation for opening/closing from comment references (#8261) 2019-10-13 23:29:10 +01:00
issue.go [Backport] [API] Allow only specific Colums to be updated on Issue (#9539) (#9580) 2020-01-02 02:38:42 -05:00
lfs_lock.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
lfs.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
log.go Fix error log when loading issues caused by a xorm bug (#7271) 2019-06-23 18:22:43 +03:00
login_source.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
main_test.go Unit tests for wiki routers (#3022) 2017-11-30 17:52:15 +02:00
migrate.go Fix milestone completness calculation when migrating (#7725) 2019-08-03 21:38:42 +03:00
models_test.go Move database settings from models to setting (#7806) 2019-08-24 11:24:45 +02:00
models.go Expose db.SetMaxOpenConns and allow non MySQL dbs to set conn pool params (#8528) (#8618) 2019-10-22 07:00:37 +01:00
notification_test.go Add 'mark all read' option to notifications (#3097) 2017-12-07 13:52:57 +08:00
notification.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
oauth2_application_test.go OAuth2 Grant UI (#6625) 2019-04-17 16:18:16 +08:00
oauth2_application.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
oauth2.go migrate gplus to google oauth2 provider (#7885) 2019-09-14 12:02:39 +02:00
org_team_test.go Fix approvals counting (#7757) 2019-08-07 07:22:41 +03:00
org_team.go Ignore mentions for users with no access (#8395) 2019-10-10 19:45:11 +03:00
org_test.go Add teams to repo on collaboration page. (#8045) 2019-09-23 23:08:03 +03:00
org.go Add teams to repo on collaboration page. (#8045) 2019-09-23 23:08:03 +03:00
pull_test.go Fix bug on pull requests when transfer head repository (#8564) (#8569) 2019-10-19 08:29:35 +01:00
pull.go Branches not at ref commit ID should not be listed as Merged (#9614) (#9639) 2020-01-08 03:06:53 +02:00
release.go Allow externalID to be UUID (#8551) (#8624) 2019-10-22 09:12:10 +01:00
repo_activity.go Add Close() method to gogitRepository (#8901) (#8956) 2019-11-13 13:54:04 +00:00
repo_branch.go Add Close() method to gogitRepository (#8901) (#8956) 2019-11-13 13:54:04 +00:00
repo_collaboration_test.go Add teams to repo on collaboration page. (#8045) 2019-09-23 23:08:03 +03:00
repo_collaboration.go Add teams to repo on collaboration page. (#8045) 2019-09-23 23:08:03 +03:00
repo_indexer.go DefaultBranch needs to be prefixed by BranchPrefix (#9356) (#9359) 2019-12-15 11:08:19 +00:00
repo_issue.go Add EnableTimetracking option to app settings (#3719) 2018-04-09 23:15:32 +08:00
repo_list_test.go [BugFix] Hide public repos owned by private orgs (#9616) 2020-01-06 10:12:55 +08:00
repo_list.go [BugFix] Hide public repos owned by private orgs (#9616) 2020-01-06 10:12:55 +08:00
repo_mirror.go Move mirror to a standalone package from models (#7486) 2019-10-01 21:40:17 +08:00
repo_permission_test.go fix bug when update owner team then visit team's repo return 404 (#6119) 2019-02-22 11:14:45 -05:00
repo_permission.go Removed unnecessary conversions (#7557) 2019-07-23 19:50:39 +01:00
repo_redirect_test.go Unit tests for repo redirects (#961) 2017-02-17 08:55:33 +08:00
repo_redirect.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
repo_test.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
repo_unit.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
repo_watch_test.go Hide unactive on explore users and some refactors (#2741) 2017-10-24 20:36:19 +03:00
repo_watch.go Fix sqlite deadlock when assigning to a PR (#5640) 2019-01-04 16:51:27 -05:00
repo.go [Backport] Fix bug when migrate from API (#8631) (#9563) 2020-01-02 01:36:00 +02:00
review_test.go Show review summary in pull requests (#5132) 2018-11-22 15:17:36 +02:00
review.go Hotfix for review actions and notifications (#8965) 2019-11-14 00:38:12 +00:00
ssh_key_test.go Fix SSH2 conditonal in key parsing code (#8806) (#8810) 2019-11-03 22:51:32 +08:00
ssh_key.go Fix SSH2 conditonal in key parsing code (#8806) (#8810) 2019-11-03 22:51:32 +08:00
star_test.go Fix tests code to prevent some runtime errors (#2381) 2017-08-28 12:17:45 +03:00
star.go Ensure that sessions are passed into queries that could use the database to prevent deadlocks (#5718) 2019-01-13 21:29:58 -05:00
task.go Backport: Hide given credentials for migrated repos. (#9098) 2019-11-20 17:23:12 -05:00
test_fixtures.go Increase the retry limit to 20 times and the interval to 200ms (#5134) 2018-10-21 16:09:17 +02:00
token_test.go Add golangci (#6418) 2019-06-12 15:41:28 -04:00
token.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
topic_test.go Add API endpoint for accessing repo topics (#7963) 2019-09-03 23:46:24 +08:00
topic.go Add API endpoint for accessing repo topics (#7963) 2019-09-03 23:46:24 +08:00
twofactor.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
u2f_test.go Override xorm type mapping for U2F counter (#6232) 2019-03-04 21:34:52 -05:00
u2f.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
unit_tests.go Move database settings from models to setting (#7806) 2019-08-24 11:24:45 +02:00
unit.go Fixes #5960 - Adds API Endpoint for Repo Edit (#7006) 2019-05-30 11:09:05 -04:00
update_test.go move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364) 2019-03-27 17:33:00 +08:00
update.go Display ui time with customize time location (#7792) 2019-08-15 22:46:21 +08:00
upload.go Use gitea forked macaron (#7933) 2019-08-23 12:40:29 -04:00
user_follow_test.go Move user_follow to separate file (#1210) 2017-03-11 16:46:53 +08:00
user_follow.go Refactor session close as xorm already does everything needed internally (#2020) 2017-06-21 08:57:05 +08:00
user_heatmap_test.go Update heatmap fixtures to restore tests (#8615) (#8616) 2019-10-21 22:15:55 +01:00
user_heatmap.go Move database settings from models to setting (#7806) 2019-08-24 11:24:45 +02:00
user_mail_test.go Fix tests code to prevent some runtime errors (#2381) 2017-08-28 12:17:45 +03:00
user_mail.go Add golangci (#6418) 2019-06-12 15:41:28 -04:00
user_openid_test.go Add golangci (#6418) 2019-06-12 15:41:28 -04:00
user_openid.go Fix SQL quoting (#5117) 2018-10-20 18:19:21 -04:00
user_test.go Revert "Fix issues/pr list broken when there are many repositories (#8409)" (#8427) 2019-10-08 20:55:16 +03:00
user.go fix: add search to reserved usernames (#9063) (#9065) 2019-11-18 22:40:14 +00:00
userlist_test.go org/members: display 2FA members states + optimize sql requests (#7621) 2019-08-02 12:06:27 -04:00
userlist.go Add teams to repo on collaboration page. (#8045) 2019-09-23 23:08:03 +03:00
webhook_dingtalk.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
webhook_discord.go Add golangci (#6418) 2019-06-12 15:41:28 -04:00
webhook_msteams.go MS Teams webhook misses commit messages (#8209) 2019-09-17 15:56:29 -04:00
webhook_slack.go Fix Slack webhook payload title generation to work with Mattermost (#9378) (#9404) 2019-12-18 20:56:35 +08:00
webhook_telegram.go Move sdk structs to modules/structs (#6905) 2019-05-11 18:21:34 +08:00
webhook_test.go Implement webhook branch filter (#7791) 2019-09-09 08:48:21 +03:00
webhook.go webhook: set Content-Type for application/x-www-form-urlencoded (#8600) 2019-10-20 18:18:05 +01:00
wiki_test.go Add Close() method to gogitRepository (#8901) (#8956) 2019-11-13 13:54:04 +00:00
wiki.go Add Close() method to gogitRepository (#8901) (#8956) 2019-11-13 13:54:04 +00:00