]> source.dussan.org Git - gitea.git/commit
projects / gitea.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 439ad34) | patch
Add apply-patch, basic revert and cherry-pick functionality (#17902)
authorzeripath <art27@cantab.net>
Wed, 9 Feb 2022 20:28:55 +0000 (20:28 +0000)
committerGitHub <noreply@github.com>
Wed, 9 Feb 2022 20:28:55 +0000 (20:28 +0000)
commiteb748f5f3c93e8e347309fc75ea8273c06a5489b
treefceec474a21fa35437bcf3e90bd549c11976b72etree | snapshot
parent439ad34c71b8777a9dac369c643560b18bc41babcommit | diff
Add apply-patch, basic revert and cherry-pick functionality (#17902)

This code adds a simple endpoint to apply patches to repositories and
branches on gitea. This is then used along with the conflicting checking
code in #18004 to provide a basic implementation of cherry-pick revert.

Now because the buttons necessary for cherry-pick and revert have
required us to create a dropdown next to the Browse Source button
I've also implemented Create Branch and Create Tag operations.

Fix #3880
Fix #17986

Signed-off-by: Andrew Thornton <art27@cantab.net>
23 files changed:
modules/git/diff.go diff | blob | history
modules/structs/repo_file.go diff | blob | history
options/locale/locale_en-US.ini diff | blob | history
routers/api/v1/api.go diff | blob | history
routers/api/v1/repo/patch.go [new file with mode: 0644] blob
routers/web/repo/cherry_pick.go [new file with mode: 0644] blob
routers/web/repo/patch.go [new file with mode: 0644] blob
routers/web/web.go diff | blob | history
services/forms/repo_form.go diff | blob | history
services/pull/patch.go diff | blob | history
services/repository/files/cherry_pick.go [new file with mode: 0644] blob
services/repository/files/patch.go [new file with mode: 0644] blob
templates/repo/branch_dropdown.tmpl diff | blob | history
templates/repo/commit_page.tmpl diff | blob | history
templates/repo/editor/cherry_pick.tmpl [new file with mode: 0644] blob
templates/repo/editor/patch.tmpl [new file with mode: 0644] blob
templates/repo/home.tmpl diff | blob | history
templates/swagger/v1_json.tmpl diff | blob | history
web_src/js/components/RepoBranchTagDropdown.js diff | blob | history
web_src/js/features/common-global.js diff | blob | history
web_src/js/features/repo-branch.js diff | blob | history
web_src/js/features/repo-legacy.js diff | blob | history
web_src/less/_repository.less diff | blob | history
Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea