-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pull request review/approval and comment on code #3748
Merged
Merged
Changes from all commits
Commits
Show all changes
104 commits
Select commit
Hold shift + click to select a range
85e1ad5
Initial ui components for pull request review
lafriks 623a9f6
Add Review
jonasfranz aeb0577
Replace ReviewComment with Content
jonasfranz 2c18552
Add load functions
jonasfranz 9544c46
Add create review comment implementation
jonasfranz 0f772d1
Simplified create and find functions for review
jonasfranz 4ad563d
Moved "Pending" to first position
jonasfranz 17af2d1
Add GetCurrentReview to simplify fetching current review
jonasfranz 75b7d9b
Preview for listing comments
jonasfranz e252d3b
Move new comment form to its own file
jonasfranz 3e5f3c3
Implement Review form
jonasfranz 61cc134
Add support for single comments
jonasfranz 36d6631
Add pending tag to pending review comments
jonasfranz 9c6bb4b
Add unit tests for Review
jonasfranz bc93592
Fetch all review ids at once
jonasfranz 58fb672
gofmt
jonasfranz 066086c
Improved comment rendering in "Files" view by adding Comments to Diff…
jonasfranz 7986d6e
Add support for invalidating comments
jonasfranz cbdd8c9
Switched back to code.gitea.io/git
jonasfranz 2f46613
Merge pull request #2 from JonasFranzDEV/feat/approval
lafriks 6d00c1a
Merge branch 'master' into feat/approval-new
jonasfranz 7723e15
Moved review migration from v64 to v65
jonasfranz 90d9dda
Rebuild css
jonasfranz 5f55ede
gofmt
jonasfranz d2b4347
Improve translations
jonasfranz ed695c1
Fix unit tests by updating fixtures and updating outdated test
jonasfranz de7081c
Comments will be shown at the right place now
jonasfranz 7c4bf56
Add support for deleting CodeComments
jonasfranz 6ae32b2
Fix problems caused by files in subdirectories
jonasfranz 4ea74e5
Add support for showing code comments of reviews in conversation
jonasfranz 7c1edf9
Merge branch 'master' into feat/approval
jonasfranz 8bb5113
Add support for "Show/Hide outdated"
jonasfranz 5c2171e
Update code.gitea.io/git
jonasfranz 0f64dad
Merge branch 'master' into feat/approval-new
jonasfranz 6e55557
Add support for new webhooks
jonasfranz 05df5a7
Update comparison
jonasfranz e5bde14
Resolve conflicts
jonasfranz a8dc699
Merge branch 'master' into feat/approval-new
jonasfranz 8ea8209
Minor UI improvements
lafriks a550052
Merge branch 'master' into feat/approval
jonasfranz 0f88cb8
update code.gitea.io/git
jonasfranz e60b3f6
Merge branch 'master' into feat/approval
jonasfranz a05d052
Merge branch 'master' into feat/approval
jonasfranz 27c488e
Merge branch 'master' into feat/approval
jonasfranz 2b6001b
Fix ui bug reported by @lunny causing wrong position of add button
jonasfranz d25df5b
Prepare solving conflicts
jonasfranz 7592f5b
Merge branch 'master' into feat/approval-new
jonasfranz 4cb3a60
Show add button only if no comments already exist for the line
jonasfranz f64f8e0
Add missing vendor files
jonasfranz f07b4e1
Merge branch 'master' into feat/approval
jonasfranz 4ad72de
Check if reviewer is nil
jonasfranz e2f60f4
Merge branch 'master' into feat/approval-new
jonasfranz 229129d
Merge remote-tracking branch 'lafriks/feat/approval' into feat/approv…
jonasfranz c083682
Show forms only to users who are logged in
jonasfranz c7dffe6
Revert "Show forms only to users who are logged in"
jonasfranz 4d0abce
Save patch in comment
jonasfranz c79e5a1
Merge branch 'master' into feat/approval-new
jonasfranz 39fcc99
Add link to comment in code
jonasfranz 9a0c394
Add reply form to comment list
jonasfranz c8c1e70
Add 'Reply' as translatable
jonasfranz 853ed7d
Merge branch 'master' into feat/approval
jonasfranz b6d8aea
gofmt
jonasfranz e3f87a9
Merge remote-tracking branch 'lafriks/feat/approval' into feat/approv…
jonasfranz 3f48c7c
Fix problems introduced by checking for singed in user
jonasfranz b4e43d6
Merge branch 'master' of https://github.com/go-gitea/gitea into feat/…
jonasfranz 45dabaf
Add v70
jonasfranz b553556
Update generated stylesheet
jonasfranz 73b325c
Fix preview
jonasfranz 3cd5ee4
Add new algo to generate diff for line range
jonasfranz 7f0eb69
Merge branch 'master' of https://github.com/go-gitea/gitea into feat/…
jonasfranz 8a84f04
Add documentation and example for CutDiffAroundLine
jonasfranz fbaeb02
Fix example of CutDiffAroundLine
jonasfranz 5dd39d3
Fix some comment UI rendering bugs
jonasfranz aee593b
Add code comment edit mode
jonasfranz 8f77329
Send notifications / actions to users until review gets published
jonasfranz d8ddade
Fix vet errors
jonasfranz dbc7aee
Send notifications also for single comments
jonasfranz a0d9afd
Fix some notification bugs, fix link
jonasfranz b2092fe
Fix: add comment icon is only shown on code lines
jonasfranz 3013c0c
Add lint comment
jonasfranz 858345d
Add unit tests for git diff
jonasfranz e340181
Merge branch 'master' into feat/approval
jonasfranz 3f39e23
Add more error messages
jonasfranz 6de1f38
Merge remote-tracking branch 'lafriks/feat/approval' into feat/approv…
jonasfranz 65d4318
Merge branch 'master' of https://github.com/go-gitea/gitea into feat/…
jonasfranz e7b2b61
Regenerated css
jonasfranz 8a6e6dc
fmt
jonasfranz 5554ad2
Regenerated CSS with latest less version
jonasfranz b29e722
Merge branch 'master' of https://github.com/go-gitea/gitea into feat/…
jonasfranz cb29fdb
Fix test by updating comment type to new ID
jonasfranz 021f028
Introducing CodeComments as type for map[string]map[int64][]*Comment
jonasfranz 5539c96
Fix data-tab issues
jonasfranz 7eec104
Merge branch 'master' of https://github.com/go-gitea/gitea into feat/…
jonasfranz ce07867
Remove unnecessary change
jonasfranz dc4a27d
refactored checkForInvalidation
jonasfranz 4c76cf5
Append comments instead of setting
jonasfranz 77caec7
Use HeadRepo instead of BaseRepo
jonasfranz f1a3e6f
Merge branch 'master' into feat/approval
jonasfranz a116913
Merge branch 'master' of https://github.com/go-gitea/gitea into feat/…
jonasfranz 64269ef
Update migration
jonasfranz 7888318
Regenerated CSS
jonasfranz 638ea14
Add copyright
jonasfranz c503a70
Merge branch 'master' of https://github.com/go-gitea/gitea into feat/…
jonasfranz 5f8c9a2
Update index.css
jonasfranz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
- | ||
id: 1 | ||
type: 1 | ||
reviewer_id: 1 | ||
issue_id: 2 | ||
content: "Demo Review" | ||
updated_unix: 946684810 | ||
created_unix: 946684810 | ||
- | ||
id: 2 | ||
type: 1 | ||
reviewer_id: 534543 | ||
issue_id: 534543 | ||
content: "Invalid Review #1" | ||
updated_unix: 946684810 | ||
created_unix: 946684810 | ||
- | ||
id: 3 | ||
type: 1 | ||
reviewer_id: 1 | ||
issue_id: 343545 | ||
content: "Invalid Review #2" | ||
updated_unix: 946684810 | ||
created_unix: 946684810 | ||
- | ||
id: 4 | ||
type: 0 # Pending review | ||
reviewer_id: 1 | ||
issue_id: 2 | ||
content: "Pending Review" | ||
updated_unix: 946684810 | ||
created_unix: 946684810 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I find the next lines a bit confusing, might want to add a comment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because we differentiate between "previous" and "proposed" lines. "Previous" lines are negative and "proposed" lines are positive. This is documented at the comment model.
Both should be appended. I will fix it.