summaryrefslogtreecommitdiffstats
path: root/templates/repo/branch
Commit message (Collapse)AuthorAgeFilesLines
* Allow unauthenticated users to compare (#11240)Kyle Evans2020-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * routers: make /compare route available to unauthenticated users Remove some bits of the compare interface if the user isn't signed in. Notably, they don't need to see the "New Pull Request" button box nor the hidden form that would fail to submit due to the POST request continuing to require proper privileges. Follow-up commits will improve the UI a bit around this, removing some "Pull Request" verbiage in favor of "Compare." * ui: home: show "compare" button for unauthenticated users This change requires pulling in the BaseRepo unconditionally and recording if the pull request is in-fact not allowed (.PullRequestCtx.Allowed). If the user isn't allowed to create a pull request, either because this isn't a fork or same-fork branch PRs aren't allowed, then we'll name the button "Compare" instead of "Pull Request." * ui: branch list: use the new Compare language when available When viewing the branch listing as an unauthenticated user, you'll get "Pull Request" buttons. use the new "Compare" verbiage instead, which matches GitHub behavior when you can't issue a pull request from the branches. Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
* ui: fix status label on branches list vertical alignment (#11109)赵智超2020-04-171-3/+3
| | | | | change status icon for merged PR to git-merge Signed-off-by: a1012112796 <1012112796@qq.com>
* Add Octicon SVG spritemap (#10107)John Olheiser2020-02-111-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add octicon SVG sprite Signed-off-by: jolheiser <john.olheiser@gmail.com> * Static prefix Signed-off-by: jolheiser <john.olheiser@gmail.com> * SVG for all repo icons Signed-off-by: jolheiser <john.olheiser@gmail.com> * make vendor Signed-off-by: jolheiser <john.olheiser@gmail.com> * Swap out octicons Signed-off-by: jolheiser <john.olheiser@gmail.com> * Move octicons to top of less imports Signed-off-by: jolheiser <john.olheiser@gmail.com> * Fix JS Signed-off-by: jolheiser <john.olheiser@gmail.com> * Definitely not a search/replace Signed-off-by: jolheiser <john.olheiser@gmail.com> * Missed regex Signed-off-by: jolheiser <john.olheiser@gmail.com> * Move to more generic calls and webpack Signed-off-by: jolheiser <john.olheiser@gmail.com> * make svg -> make webpack Signed-off-by: jolheiser <john.olheiser@gmail.com> * Remove svg-sprite Signed-off-by: jolheiser <john.olheiser@gmail.com> * Update tests Signed-off-by: jolheiser <john.olheiser@gmail.com> * Missed a test Signed-off-by: jolheiser <john.olheiser@gmail.com> * Remove svg from makefile Signed-off-by: jolheiser <john.olheiser@gmail.com> * Suggestions Signed-off-by: jolheiser <john.olheiser@gmail.com> * Attempt to fix test Signed-off-by: jolheiser <john.olheiser@gmail.com> * Update tests Signed-off-by: jolheiser <john.olheiser@gmail.com> * Revert timetracking test Signed-off-by: jolheiser <john.olheiser@gmail.com> * Swap .octicon for .svg in less Signed-off-by: jolheiser <john.olheiser@gmail.com> * Add aria-hidden Signed-off-by: jolheiser <john.olheiser@gmail.com> * Replace mega-octicon Signed-off-by: jolheiser <john.olheiser@gmail.com> * Fix webpack globbing on Windows Signed-off-by: jolheiser <john.olheiser@gmail.com> * Revert Co-Authored-By: silverwind <me@silverwind.io> * Fix octions from upstream Signed-off-by: jolheiser <john.olheiser@gmail.com> * Fix Vue and missed JS function Signed-off-by: jolheiser <john.olheiser@gmail.com> * Add JS helper and PWA Signed-off-by: jolheiser <john.olheiser@gmail.com> * Preload SVG Signed-off-by: jolheiser <john.olheiser@gmail.com> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: techknowlogick <matti@mdranta.net>
* Fix branch page pull request title and link error (#10092)Lunny Xiao2020-02-011-5/+5
| | | | | | * Fix branch page pull request title and link error * Fix ui
* Branches not at ref commit ID should not be listed as Merged (#9614)zeripath2020-01-071-0/+6
| | | | | | | | | | | 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
* Button tooltip formatting under Branches (#9034)Vedran2019-11-161-4/+4
| | | | | | * Fixes button tooltip formatting under Branches * Formatting on download button for default branch
* [Branch View] Add Included TAG (#8449)65432019-10-141-1/+5
| | | | | | | | * included message * add property IsIncluded * Add Orange Lable
* [Branch View] show "New Pull Request" Button only if posible (#7977)65432019-08-261-1/+1
| | | | | | | | * add check Commits Ahead is gt 0 * code format to start drone-ci test again and formate code is also nice :)
* sugestion to use range .Branches (#7674)65432019-07-301-2/+2
| | | https://github.com/go-gitea/gitea/pull/7668/files/d57973a8041a741fdb7e77bc6ab18431bbf95ba4
* hide delete/restor button on archived repos (#7658)65432019-07-291-1/+1
| | | close issue #7653
* [Branch View] add download button (#7604)65432019-07-291-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | * add download-button info message * add overflow-visible css for table colum class * right colum is always there * add download button for default branch * add download button for all other branchs * resize table colum so two buttons fit in * code indent avter rebase * show commit divergence corect https://github.com/go-gitea/gitea/issues/7625 * changes because of merge master into ... * optimize if statement for protected branches * dont downloat a deleted branch - fix error 404
* [Branch View] Protection Symbole (delete dublicate) (#7624)65432019-07-271-5/+3
| | | | | | * delet protectin symbol on "action column" * code format
* [Branch View] Delete Table Header (#7622)65432019-07-261-14/+4
| | | | | | * add class trom table header to table body * remove table header
* [Branch View] icons to buttons (#7602)65432019-07-261-2/+2
| | | | | | | | * add restore-button info message * branch deltete undo icon to button * branch deltete icon to button
* Make default branch name link to default branch (#7519)Gary Kim2019-07-181-1/+1
| | | | | | | | | | The default branch's name on the branches page for a repo was previously simply text and did not link anywhere. The name is now a link to the default branch just like the non-default branch names. Signed-off-by: Gary Kim <gary@garykim.dev>
* Add Extra Info to Branches Page (#7461)Gary Kim2019-07-171-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add branch protection information to branches page This change will add a tag on the ui that indicates whether a branch is protected on the repository branches page. Signed-off-by: Gary Kim <gary@garykim.dev> * Add last commit information to repo branches page This change adds the ID and commit message of the last commit on a branch to the branches page for repositories. Signed-off-by: Gary Kim <gary@garykim.dev> * Make branch page commit message truncate in css rather then template The truncating of commit messages shown under branches in the repository branches page has been moved to using css rather then the Go template as the template was causing some issues when the commit messaged had a link when rendered. This commit also makes the commit message paragraph itself use flex in order to make managing its elements easier. Signed-off-by: Gary Kim <gary@garykim.dev>
* Only show "New Pull Request" button if repo allows pulls (#7426)Gary Kim2019-07-111-1/+1
| | | Signed-off-by: Gary Kim <gary@garykim.dev>
* Show Pull Request button or status of latest PR in branch list (#6990)Mario Lubenka2019-06-271-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Show Pull Request button or status of latest PR in branch list Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Do not show pull request button on deleted branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Do not show commit divergence on deleted branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use XORMs Get instead of limit * Links pull request ID and use smaller labels for displaying the pull request status Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Handle error when getting latest pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Indent template Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check error when loading issue Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Number of commits ahead/behind in branch overview (#6695)Mario Lubenka2019-05-051-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Call Git API to determine divergence of a branch and its base branch Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show commit divergance in branch list Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adds missing comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adds test for diverging commits Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Try comparing commits instead of branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes test as CI can't run it Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts signature of percentage function to allow providing multiple integers as numerator Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Moves CountDivergingCommits function into repofiles module Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Display branch name in delete branch confirmation modal. (#5654)Harshit Bansal2019-01-061-2/+2
| | | Fixes: #5630.
* Fix some issues with special chars in branch names (#3767)nubenum2018-09-171-2/+2
| | | Signed-off-by: Robin Durner <github@nubenum.de>
* Prevent html entity escaping (#4471)Joel da Rosa2018-07-191-1/+1
|
* Improve English grammar and consistency. (#3614)bugreport02018-04-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | * Start improving English grammar and consistency. * Apply review comments, push translation further. * Additional review changes; expand translation. * Undo team/organization change, further translation. * Add site administration; review comments; merge. * Update hardcoded branch protection string tests. * Update hardcoded branch deletion string test. * Update another hardcoded translation string test. * Add my nickname to the list of translators. * Implement @lafriks review comments. * Remove (now) unused branch deletion warnings. * Remove (now) unused branch deletion warnings.
* Remove unnecessary Safe tags (#3778)Bwko2018-04-101-3/+3
|
* feat: Add branch link in branch list. (#3576)Bo-Yi Wu2018-02-241-2/+2
|
* Refactor struct's time to remove unnecessary memory usage (#3142)Lunny Xiao2017-12-111-1/+1
| | | | | | | | | | | | | | * refactor struct's time to remove unnecessary memory usage * use AsTimePtr simple code * fix tests * fix time compare * fix template on gpg * use AddDuration instead of Add
* Add branch overiew page (#2108)Bwko2017-10-261-0/+81
* Add branch overiew page * fix changed method name on sub menu * remove unused code