57c7a7aa72
Ensure Update button is enabled even when CI has failed ( #10640 )
...
* ignore pull status
* fix css
* fix css
2020-03-07 03:24:42 +02:00
80db44267c
Add Approval Counts to pulls list ( #10238 )
...
* Add Approval Counts to pulls list
Add simple approvals counts to pulls lists
* Remove non-official counts
* Add PR features to milestone_issues.tmpl
2020-03-06 03:44:06 +00:00
f422a115f4
Issue writers perms can modify issues ( #10623 )
...
Signed-off-by: jolheiser <john.olheiser@gmail.com >
2020-03-06 09:57:18 +08:00
afa1e1af16
Fix templates ( #10596 )
...
Signed-off-by: jolheiser <john.olheiser@gmail.com >
2020-03-04 08:56:53 +02:00
c161bb013e
Change action GETs to POST ( #10462 )
...
* Change action GETs to POST
* submite = submit + smite
* No more # href
* Fix test
* Match other tests
* Explicit csrf
Signed-off-by: jolheiser <john.olheiser@gmail.com >
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com >
2020-02-25 14:28:47 -06:00
d67e9b9629
SVG Octicon fixes ( #10237 )
...
* SVG fixes
Signed-off-by: jolheiser <john.olheiser@gmail.com >
* Colorize span->svg only
Signed-off-by: jolheiser <john.olheiser@gmail.com >
* @silverwind suggestions
Signed-off-by: jolheiser <john.olheiser@gmail.com >
* Alphabetical
Signed-off-by: jolheiser <john.olheiser@gmail.com >
* Convert suburl and staticPrefix to window.config
Signed-off-by: jolheiser <john.olheiser@gmail.com >
* De-structure
Signed-off-by: jolheiser <john.olheiser@gmail.com >
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com >
2020-02-11 20:53:18 -05:00
2399bad1f1
fix label menu text on miletone issues ( #10242 )
...
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com >
2020-02-12 01:07:07 +01:00
54af3c90c7
Fix issue sidebar menus having an infinite height ( #10239 )
...
* Revert "Limit label list height on edit issue page"
* Fix issue sidebar menus having an infinite height
2020-02-11 22:40:47 +02:00
86fdba177a
Add Octicon SVG spritemap ( #10107 )
...
* 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 >
2020-02-11 12:02:41 -05:00
602b29e965
Limit label list height on edit issue page ( #10216 )
2020-02-11 16:41:48 +01:00
9789e0ad53
Only show conflicted files if not merged ( #10197 )
...
* Only show conflicted files if not merged
* try again
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com >
Co-authored-by: techknowlogick <matti@mdranta.net >
2020-02-09 21:53:41 -05:00
6e6da2c276
Tweak locale to respect singular conflicting file message in P… ( #10177 )
...
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com >
2020-02-07 17:38:18 +01:00
08c9160e71
Allow emoji on review head comments ( #10159 )
...
Co-authored-by: techknowlogick <matti@mdranta.net >
2020-02-06 20:35:53 +02:00
3ff95cef60
Show if a PR has conflicting files on the PR lists ( #10130 )
...
Co-authored-by: Lauris BH <lauris@nix.lv >
2020-02-04 00:14:38 +02:00
169bb55ec6
[UI] Show pull icon on pull ( #10061 )
...
* make fmt
* show pull icon on pull
2020-01-29 18:54:34 +00:00
88c212a8a3
Fix image ( #9962 )
...
Signed-off-by: jolheiser <john.olheiser@gmail.com >
2020-01-24 21:23:10 +00:00
f6067a8465
Migrate reviews when migrating repository from github ( #9463 )
...
* fix typo
* Migrate reviews when migrating repository from github
* fix lint
* Added test and migration when external user login
* fix test
* fix commented state
* Some improvements
* fix bug when get pull request and ref original author on code comments
* Fix migrated line; Added comment for review
* Don't load all pull requests attributes
* Fix typo
* wrong change copy head
* fix tests
* fix reactions
* Fix test
* fix fmt
* fix review comment reactions
2020-01-23 19:28:15 +02:00
81daf26878
Fix wrong hint when status checking is running on pull request view ( #9886 )
...
* Fix wrong hint when status checking is running on pull request view
* fix lint
* fix test
* fix test
* fix wrong tmpl
* fix import
* rename function name
2020-01-22 11:46:04 +08:00
2f7a747e4f
Fixed repo link in generated comment for cross repository dependency ( #9863 )
...
* fixed link to issue in issue comments after adding/removing a dependency, before links assumed the issue was in the same repository. also changed the format of the displayed issue since the issue will not necessarily be in the same repo
* based on pr comments, changed to use HTMLURL instead of piecing together the issue url, and added an if statement around the issue link display as a nil protection
* only showing repo name in dependency comment if the issue is from another repo
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com >
2020-01-21 10:18:52 +00:00
6d6f1d568e
Fix wrong permissions check when issues/prs shared operations ( #9885 )
...
* Fix wrong permissions check when issues/prs shared operations
* move redirect to the last of the function
* fix swagger
Co-authored-by: zeripath <art27@cantab.net >
Co-authored-by: Lauris BH <lauris@nix.lv >
2020-01-20 13:00:32 +01:00
f540d0ac87
Fix issues/pulls dependencies problems ( #9842 )
...
* Fix issues/pulls dependencies problems
* fix swagger and api param name
* fix js
2020-01-19 14:43:38 +08:00
0641965860
Change won't sign information text to black. ( #9843 )
...
* Change won't sign information text to black.
* icon and text same color
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com >
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com >
2020-01-18 12:30:35 +01:00
36943e56d6
Add "Update Branch" button to Pull Requests ( #9784 )
...
* add Divergence
* add Update Button
* first working version
* re-use code
* split raw merge commands and db-change functions (notify, cache, ...)
* use rawMerge (remove redundant code)
* own function to get Diverging of PRs
* use FlashError
* correct Error Msg
* hook is triggerd ... so remove comment
* add "branch2" to "user2/repo1" because it unit-test "TestPullView_ReviewerMissed" use it but dont exist jet :/
* move GetPerm to IsUserAllowedToUpdate
* add Flash Success MSG
* imprufe code
- remove useless js chage
* fix-lint
* TEST: add PullRequest ID:5
Repo: user2/repo1
Base: branch1
Head: pr-to-update
* correct comments
* make PR5 outdated
* fix Tests
* WIP: add pull update test
* update revs
* update locales
* working TEST
* update UI
* misspell
* change style
* add 1s delay so rev exist
* move row up (before merge row)
* fix lint nit
* UI remove divider
* Update style
* nits
* do it right
* introduce IsSameRepo
* remove useless check
Co-authored-by: Lauris BH <lauris@nix.lv >
2020-01-17 08:03:40 +02:00
18e0447b3f
Fix admin handling at merge of PR ( #9749 )
...
* Admin shall be able to bypass merge checks.
* Repository admin should not bypass if merge whitelist is set.
* Add code comment about checks that PR are ready
* notAllOverrideableChecksOk->notAllOverridableChecksOk
* Fix merge, require signed currently not overridable.
* fix
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com >
2020-01-16 23:01:22 +02:00
665d7e91a8
Fix signing info on PR view if not signed in ( #9788 )
2020-01-15 22:55:25 +00:00
66ee9b87f9
Add require signed commit for protected branch ( #9708 )
...
* Add require signed commit for protected branch
* Fix fmt
* Make editor show if they will be signed
* bugfix
* Add basic merge check and better information for CRUD
* linting comment
* Add descriptors to merge signing
* Slight refactor
* Slight improvement to appearances
* Handle Merge API
* manage CRUD API
* Move error to error.go
* Remove fix to delete.go
* prep for merge
* need to tolerate \r\n in message
* check protected branch before trying to load it
* Apply suggestions from code review
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com >
* fix commit-reader
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com >
2020-01-15 09:32:57 +01:00
32fb813133
Allow repo admin to merge PR regardless of review status ( #9611 )
...
* Allow repo admin to merge even if review is not ok.
2020-01-11 02:29:34 -05:00
07520431ae
chore(PR): Add Reviewed-on in commit message ( #9623 )
2020-01-09 14:31:09 +00:00
25531c71a7
Mark PR reviews as stale at push and allow to dismiss stale approvals ( #9532 )
...
Fix #5997 .
If a push causes the patch/diff of a PR towards target branch to change, all existing reviews for the PR will be set and shown as stale.
New branch protection option to dismiss stale approvals are added.
To show that a review is not based on the latest PR changes, an hourglass is shown
2020-01-09 01:47:45 +00:00
e5d8e2d10c
Branches not at ref commit ID should not be listed as Merged ( #9614 )
...
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-07 17:06:14 +00:00
2a1cf5bae9
Add some padding to the shadowed comment box ( #9612 )
...
* Add some padding to the shadowed comment box
* prevent the padding affecting the other comments
2020-01-05 19:25:27 +00:00
ea707f5a77
Add branch protection option to block merge on requested changes. ( #9592 )
...
* Add branch protection option to block merge on requested changes.
* Add migration step
* Fix check to correct negation
* Apply suggestions from code review
Language improvement.
Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com >
* Copyright year.
Co-authored-by: John Olheiser <42128690+jolheiser@users.noreply.github.com >
Co-authored-by: Lauris BH <lauris@nix.lv >
2020-01-03 19:47:09 +02:00
0c07f1de5b
Provide Default messages for merges ( #9393 )
...
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com >
2019-12-30 18:34:11 -05:00
261c3a56a2
[Fix] Release attachment should use DownloadURL() not Name ( #9529 )
...
* Handle if two or more attachments have the same name
* previously only the first could be downloaded - now each is downloadable
* dos also take care of #6506 (fix was: #6512 )
* use func DownloadURL() at issue attatchments too
2019-12-28 23:33:13 +00:00
ed67bbe444
Fix repository issues pagination bug when there are more than one label filter ( #9512 )
2019-12-28 14:43:46 +00:00
4ee97465e9
[Fix] AllowedReaction code ( #9518 )
...
* optimize
* CI.restart()
Co-authored-by: techknowlogick <matti@mdranta.net >
Co-authored-by: zeripath <art27@cantab.net >
2019-12-27 18:43:56 -05:00
f2d03cda96
[API] Extend times API ( #9200 )
...
Extensively extend the times API.
close #8833 ; close #8513 ; close #8559
2019-12-27 20:30:58 +00:00
601b0cf4c1
Add description to labels on create issue ( #9392 )
2019-12-17 15:02:17 -05:00
61db834904
Change target branch for pull request ( #6488 )
...
* Adds functionality to change target branch of created pull requests
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Use const instead of var in JavaScript additions
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Check if branches are equal and if PR already exists before changing target branch
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Make sure to check all commits
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Print error messages for user as error flash message
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Disallow changing target branch of closed or merged pull requests
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Resolve conflicts after merge of upstream/master
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Change order of branch select fields
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Removes duplicate check
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Use ctx.Tr for translations
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Recompile JS
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Use correct translation namespace
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Remove redundant if condition
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Moves most change branch logic into pull service
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Completes comment
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Add Ref to ChangesPayload for logging changed target branches
instead of creating a new struct
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Revert changes to go.mod
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Directly use createComment method
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Return 404 if pull request is not found. Move written check up
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Remove variable declaration
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Return client errors on change pull request target errors
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Return error in commit.HasPreviousCommit
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Adds blank line
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Test patch before persisting new target branch
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Update patch before testing (not working)
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Removes patch calls when changeing pull request target
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Removes unneeded check for base name
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Moves ChangeTargetBranch completely to pull service. Update patch status.
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Set webhook mode after errors were validated
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Update PR in one transaction
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Move logic for check if head is equal with branch to pull model
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Adds missing comment and simplify return
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
* Adjust CreateComment method call
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com >
2019-12-16 14:20:25 +08:00
1583c48e3a
Show label list on label set ( #9251 )
...
* Showing the list of labels of template files #7812
* Returning and logging errors when loading labels
* Commenting public method
* Change log level in case of error loading labels.
2019-12-06 21:13:19 -05:00
8875586570
Change some label colors ( #9051 )
...
* Change label colors
* Override black basic label background for green theme on label list
2019-12-03 20:39:58 -05:00
bac4b78e09
Branch protection: Possibility to not use whitelist but allow anyone with write access ( #9055 )
...
* Possibility to not use whitelist but allow anyone with write access
* fix existing test
* rename migration function
* Try to give a better name for migration step
* Clear settings if higher level setting is not set
* Move official reviews to db instead of counting approvals each time
* migration
* fix
* fix migration
* fix migration
* Remove NOT NULL from EnableWhitelist as migration isn't possible
* Fix migration, reviews are connected to issues.
* Fix SQL query issues in GetReviewersByPullID.
* Simplify function GetReviewersByIssueID
* Handle reviewers that has been deleted
* Ensure reviews for test is in a well defined order
* Only clear and set official reviews when it is an approve or reject.
2019-12-03 20:08:56 -05:00
668eaf95d5
[Feature] Custom Reactions ( #8886 )
...
* add [ui] Reactions
* move contend check from form to go functions
* use else if
* check if reaction is allowed only on react
(so previous custom reaction can be still removed)
* use $.AllowedReactions in templates
* use ctx.Flash.Error
* use it there too
* add redirection
* back to server error
because a wrong reaction is a template issue ...
* add emoji list link
* add docs entry
* small wording nit
suggestions from @jolheiser - thx
* same reactions as github
* fix PR reactions
* handle error so template JS could check
* Add Integrations Test
* add REACTIONS setting to cheat-sheet doc page
2019-12-01 17:57:24 -05:00
c9d50bcab5
Correct tooltip msg blocked by dependencies ( #9211 )
2019-11-29 14:05:49 -05:00
95c3dc856a
Fix max length check and limit in multiple repo forms ( #9148 )
...
* Fix input field max length for release, label and milestone forms
* Add max length for isseu and PR title
2019-11-25 01:06:23 +02:00
eb0359cad4
Context menus for comments ( #9043 )
...
* Add quote replies
Signed-off-by: jolheiser <john.olheiser@gmail.com >
2019-11-19 20:33:42 +02:00
b15f26b1cf
Close/reopen issues by keywords in titles and comments ( #8866 )
...
* Add close/reopen from comment functionality
* Fix comment
* Rewrite closing/reopening template
* Check xref permissions, move action to services/pull
* Fix RefIsPull field
* Add xref tests
* Fix xref unique filter
* Only highlight keywords for actionable xrefs
* Fix xref neuter filter
* Fix check return status
* Restart CI
2019-11-18 15:13:07 +02:00
aa178176db
Add first issue comment hashtag ( #9052 )
2019-11-17 16:00:39 +02:00
97dc314652
Fix broken link to branch from issue list ( #9003 )
...
* Fix broken link to branch from issue list
* Update templates/repo/issue/list.tmpl
Co-Authored-By: mrsdizzie <info@mrsdizzie.com >
* apply @mrsdizzie's review
2019-11-15 11:38:54 +00:00
9bd879bef8
fix bug when pack js ( #8992 )
2019-11-14 19:58:32 +02:00
