summaryrefslogtreecommitdiffstats
path: root/templates/repo/pulls
Commit message (Collapse)AuthorAgeFilesLines
* Prettify timeline 3 (#11139)Sorien2020-05-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | * Fix timeline comments sections borders * Fix files dropzone right alignment * Update review comment form and controls * Clear segment style from comment form tabs * Remove segment class from pulls tab * Fix Time Tracker - Add Time button border * Fix buttons right alignment * Markdown tab minimal height * Fix DropZone hover effect * Fix Lint + remove unused controls class Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: zeripath <art27@cantab.net>
* Add missing commit states to PR checks template (#11085)CirnoT2020-04-161-0/+4
| | | | | | | | | * Add missing commit states to PR checks template * Add separate translation strings for warning and error * Fix failure status string * Revert accidental change with whitespace
* Add Octicon SVG spritemap (#10107)John Olheiser2020-02-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* Refuse merge until all required status checks success (#7481)Lunny Xiao2019-09-181-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refuse merge until ci successfully * deny merge request when required status checkes not succeed on merge Post and API * add database migration for added columns on protected_branch * fix migration * fix protected branch check bug * fix protected branch settings * remove duplicated code on check pull request's required commit statuses pass * remove unused codes * fix migration * add newline for template file * fix go mod * rename function name and some other fixes * fix template * fix bug pull view * remove go1.12 wrong dependencies * add administrator bypass when protected branch status check enabled * fix bug * improve the codes
* 1148: Take up the full width when viewing the diff in split view. (#8114)pmdematagoda2019-09-071-1/+1
| | | This replicates how the commit view works in split view.
* Add commit statuses reports on pull request view (#6845)Lunny Xiao2019-06-301-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add commit statuses reports on pull view * Add some translations * improve the UI * fix fmt * fix tests * add a new test git repo to fix tests * fix bug when headRepo or headBranch missing * fix tests * fix tests * fix consistency * fix tests * fix tests * change the test repo * fix tests * fix tests * fix migration * keep db size consistency * fix translation * change commit hash status table unique index * remove unused table * use char instead varchar * make hashCommitStatusContext private * split merge section with status check on pull view ui * fix tests; fix arc-green theme on pull ui
* Compare branches, commits and tags with each other (#6991)Mario Lubenka2019-06-071-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Supports tags when comparing commits or branches Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Hide headline when only comparing and don't load unused data Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Merges compare logics to allow comparing branches, commits and tags with eachother Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Display branch or tag instead of commit when used for comparing Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show pull request form after click on button Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Transfers relevant pull.go changes from master to compare.go Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes error when comparing forks against a commit or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Removes console.log from JavaScript file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Show icon next to commit reference when comparing branch or tag Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Updates css file Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Fixes import order * Renames template variable * Update routers/repo/compare.go Co-Authored-By: zeripath <art27@cantab.net> * Update from master Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Allow short-shas in compare * Renames prInfo to compareInfo Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Check PR permissions only if compare is pull request Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Adjusts comment Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com> * Use compareInfo instead of prInfo
* Add more title attributes on shortened names (#6647)zeripath2019-04-171-3/+3
|
* Prevent server 500 on compare branches with no common history (#6555)zeripath2019-04-091-0/+3
| | | | | * Prevent 500 if there is no common mergebase * Prevent creation of PR with no history
* Add the Owner Name to differentiate when merging (#3807)Luo Yifei2019-02-121-4/+4
|
* Fix some issues with special chars in branch names (#3767)nubenum2018-09-172-2/+2
| | | Signed-off-by: Robin Durner <github@nubenum.de>
* User shouldn't be able to approve or reject his/her own PR (#4729)Lanre Adelowo2018-08-201-0/+1
| | | | | | | | | | | | | | | | * Make sure author cannot reject/approve their own PR * Disable buttons in templates too * Remove unneccessary if check since the switch below catches it * Fix IsOwner check * Update template and remove new template variable * Add alert template and redirect to diff page on review failure * Redirect to files diff as a little update to #4632
* Fix typos in i18n variable names. (#4080)Matthew Richardson2018-07-041-2/+2
|
* Responsive view (#2750)Morgan Bazalgette2017-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Viewport meta tag * responsive: dashboard * responsive: issues page * responsive: Explore page * responsive: navbar, and some navbar css refactoring * responsive: button for collapsing navbar in mobile view * Mark the hamburger button as active when pressed * better homepage for responsive views * Bring back jump class in navbar The class was necessary, because this way the dropdown doesn't assume the contents of the selected item. * make repository homes responsive * Make file view page responsive * Make forms look good on responsive views * make commits and commit diff view responsive * issues and PRs * responsive wiki * Don't place auto-init far off the page * Minor changes to amend broken stuff minor improvements - make login/sign up in navbar stackable - make navbar in explore and sign in not stackable Change selected class in TestPullCompare Fix typo that happened when rebasing fix dashboard on org view improve profile UI Use clearing on file diff to fix broken UI caused by floating elements remove unresolved merge conflict, and | Sanitize Fix repo home not loading
* Fix so that user can still fork his own repository to owned organizations ↵Lauris BH2017-10-151-10/+10
| | | | | | | | | | (#2699) * Fix so that user can still fork his own repository to his organizations * Fix to only use owned organizations * Add integration test for forking own repository to owned organization
* resolved #310: hide fork to self (#323)Lunny Xiao2016-12-011-1/+1
|
* Web editor: improve edit fileUnknwon2016-08-282-2/+2
|
* #3348 always use relative avatar link in the templateUnknwon2016-08-051-3/+3
|
* Refactor User.Id to User.IDUnknwon2016-07-241-4/+4
|
* Fix problems with '#' in branchnameOdin Ugedal2016-03-151-2/+2
| | | | | Add proper escaping of '#' in branchname in compare when doing pull requests. This addresses issue #2822.
* Fix pull request availability checkUnknwon2016-03-063-4/+4
|
* #1597 support pull requests in same repositoryUnknwon2016-03-041-2/+2
|
* Change colour of numbers on pull request tabs if greater than zerochriswatt2016-02-281-3/+3
|
* #2014 allow switch branches between two orgs in compose PRUnknwon2015-12-201-2/+2
|
* #2251 fix button nameUnknwon2015-12-192-2/+2
|
* Indent all templates with tabsAdam Strzelecki2015-12-085-117/+117
| | | | | | | | | | | | This commit improves templates readability, since all of them use consistent indent with all template command blocks indented too. 1. Indents both HTML containers such as <div>, <p> and Go HTML template blocks such as {{if}} {{with}} 2. Cleans all trailing white-space 3. Adds trailing last line-break to each file
* UI: long organization name in create repository owner listUnknwon2015-11-181-4/+4
|
* fix #1981Unknwon2015-11-181-2/+2
|
* New/reopen PR checks if there is any unmerged and open PRUnknwon2015-10-181-1/+1
|
* basic PR featureUnknwon2015-09-021-4/+4
|
* PR: nothing to commit and has pull request checkUnknwon2015-09-021-1/+11
|
* finish PR UIUnknwon2015-09-024-5/+60
|
* work on PR conversationUnknwon2015-09-011-0/+3
|
* #1021 Forked repo unavailable after deleting original repoUnknwon2015-09-011-1/+1
|
* fix dropdown searchUnknwon2015-08-311-6/+6
|
* fix menu overflowUnknwon2015-08-261-2/+3
|
* upgrade new issue to SUI v2Unknwon2015-08-101-2/+2
|
* Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2Unknwon2015-08-101-3/+3
|\ | | | | | | | | | | | | # Conflicts: # modules/bindata/bindata.go # public/css/gogs.min.css # templates/repo/header.tmpl
| * Generate random avatar based on e-mail when disable GravatarUnknwon2015-08-091-3/+3
| |
* | UI: create issue with title and contentUnknwon2015-08-091-0/+1
| |
* | auto-redirect when finish filter branchUnknwon2015-08-081-2/+2
| |
* | WIP: create PR - choose branchUnknwon2015-08-081-0/+51
|/
* better fork permission checkUnknwon2015-08-081-0/+2
|
* improve fork processUnknwon2015-08-081-0/+69