-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Place inline diff comment dialogs in the 4th column. #18321
Merged
Merged
Conversation
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
zeripath
added
type/bug
topic/ui
Change the appearance of the Gitea UI
skip-changelog
This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
labels
Jan 18, 2022
zeripath
approved these changes
Jan 18, 2022
GiteaBot
added
the
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
label
Jan 18, 2022
zeripath
changed the title
Update column that review dialog appears in. Actions #18320
Comment dialogs for inline comments should appear in 4th column (not 3rd column)
Jan 18, 2022
zeripath
changed the title
Comment dialogs for inline comments should appear in 4th column (not 3rd column)
Place inline diff comment dialogs in the 4th column.
Jan 18, 2022
Tested, it works. |
wxiaoguang
approved these changes
Jan 18, 2022
GiteaBot
added
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
and removed
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
labels
Jan 18, 2022
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Jan 19, 2022
* giteaoffical/main: Restore propagation of ErrDependenciesLeft (go-gitea#18325) Fix PR comments UI (go-gitea#18323) Make the height of the editor in Review Box smaller (4 lines as GitHub) (go-gitea#18319) Fix commit links on compare page (go-gitea#18310) Update JS dependencies, remove eslint-plugin-github (go-gitea#18317) Add MirrorUpdated field to Repository API type (go-gitea#18267) replace satori/go.uuid with gofrs/uuid (go-gitea#18311) Place inline diff comment dialogs in the 4th column. (go-gitea#18321) Use indirect comparison when showing pull requests (go-gitea#18313) Prevent ambiguous column error in organizations page (go-gitea#18314) Correctly upload LFS files (go-gitea#18316) [skip ci] Updated translations via Crowdin update description about vendoring in CONTRIBUTING.md (go-gitea#18280) Fix CheckRepoStats and reuse it during migration (go-gitea#18264) Minor tweak to tag list (go-gitea#18295)
Merged
zeripath
added a commit
that referenced
this pull request
Feb 1, 2022
Currently the "File Changed" tab of a PR is somehow broken. This is also true for the current release 1.16.0. When you are on the "File Changed" tab, and want to look at code excerpt before or after the code changes, the layout breaks. You can test this on try.gitea.io here: https://try.gitea.io/testnotexisting/magic_enum/pulls/2/files The problem occurs for the unified view and for the split view. Kind of the same problem was there for commenting a line of code, this was fixed in #18321 and #18403. For consistency, I changed the solution of #18321, I removed the ``colspan`` and instead added a ``<td>``. The goal was to have code similarly with the split view. Also the separator line in the split view was in the wrong column, this was fixed too.* more consistent unified review comment Fix #18516 Co-authored-by: Andrew Thornton <art27@cantab.net>
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Feb 1, 2022
Backport go-gitea#18502 Currently the "File Changed" tab of a PR is somehow broken. This is also true for the current release 1.16.0. When you are on the "File Changed" tab, and want to look at code excerpt before or after the code changes, the layout breaks. You can test this on try.gitea.io here: https://try.gitea.io/testnotexisting/magic_enum/pulls/2/files The problem occurs for the unified view and for the split view. Kind of the same problem was there for commenting a line of code, this was fixed in go-gitea#18321 and go-gitea#18403. For consistency, I changed the solution of go-gitea#18321, I removed the ``colspan`` and instead added a ``<td>``. The goal was to have code similarly with the split view. Also the separator line in the split view was in the wrong column, this was fixed too.* more consistent unified review comment Fix go-gitea#18516 Co-authored-by: Andrew Thornton <art27@cantab.net>
zeripath
added a commit
that referenced
this pull request
Feb 2, 2022
Backport #18502 Currently the "File Changed" tab of a PR is somehow broken. This is also true for the current release 1.16.0. When you are on the "File Changed" tab, and want to look at code excerpt before or after the code changes, the layout breaks. You can test this on try.gitea.io here: https://try.gitea.io/testnotexisting/magic_enum/pulls/2/files The problem occurs for the unified view and for the split view. Kind of the same problem was there for commenting a line of code, this was fixed in #18321 and #18403. For consistency, I changed the solution of #18321, I removed the ``colspan`` and instead added a ``<td>``. The goal was to have code similarly with the split view. Also the separator line in the split view was in the wrong column, this was fixed too.* more consistent unified review comment Fix #18516 Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: confusedsushi <confused.sushi@googlemail.com>
Chianina
pushed a commit
to Chianina/gitea
that referenced
this pull request
Mar 28, 2022
Comment dialogs for inline comments should appear in 4th column (not 3rd column), this PR changes the column that the inline review comment is associated with. This problem has occurred due to an unrecognised conflict between go-gitea#17562 and go-gitea#17315. Fix as zeripath suggested in go-gitea#18320 Fix go-gitea#18320 Co-authored-by: zeripath <art27@cantab.net>
Chianina
pushed a commit
to Chianina/gitea
that referenced
this pull request
Mar 28, 2022
Currently the "File Changed" tab of a PR is somehow broken. This is also true for the current release 1.16.0. When you are on the "File Changed" tab, and want to look at code excerpt before or after the code changes, the layout breaks. You can test this on try.gitea.io here: https://try.gitea.io/testnotexisting/magic_enum/pulls/2/files The problem occurs for the unified view and for the split view. Kind of the same problem was there for commenting a line of code, this was fixed in go-gitea#18321 and go-gitea#18403. For consistency, I changed the solution of go-gitea#18321, I removed the ``colspan`` and instead added a ``<td>``. The goal was to have code similarly with the split view. Also the separator line in the split view was in the wrong column, this was fixed too.* more consistent unified review comment Fix go-gitea#18516 Co-authored-by: Andrew Thornton <art27@cantab.net>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
skip-changelog
This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
topic/ui
Change the appearance of the Gitea UI
type/bug
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.
Comment dialogs for inline comments should appear in 4th column (not 3rd column), this PR changes the column that the inline review comment is associated with.
This problem has occurred due to an unrecognised conflict between #17562 and #17315.
Fix as @zeripath suggested in #18320
Fix #18320