Use Vue to refactor pull merge UI #19650
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
wxiaoguang
added
topic/ui
This comment was marked as resolved.
This comment was marked as resolved.
GiteaBot
added
the
lgtm/need 2
|
@6543 I am cleaning comments, the eslint and script-module cann't work together. pull & try again. |
6543
approved these changes
May 7, 2022
GiteaBot
added
lgtm/need 1
6543
approved these changes
May 7, 2022
delvh
reviewed
May 7, 2022
wxiaoguang
commented
May 8, 2022
|
@wxiaoguang please resolve config |
|
Need to confirm a change first: https://github.com/go-gitea/gitea/pull/18177/files#r867490307 |
# Conflicts: # templates/repo/issue/view_content/pull.tmpl
|
I think that the change in pull.tmpl on main branch might be wrong. So I just keep the detailed message textarea for squash merge in this PR. Updated. |
|
@wxiaoguang Merge conflict resolution? |
This comment was marked as off-topic.
This comment was marked as off-topic.
delvh
approved these changes
May 12, 2022
GiteaBot
added
lgtm/done
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
May 12, 2022
* giteaofficial/main: Use Vue to refactor pull merge UI (go-gitea#19650) [skip ci] Updated translations via Crowdin
AbdulrhmnGhanem
pushed a commit
to kitspace/gitea
that referenced
this pull request
Aug 24, 2022
* Use Vue to refactor pull merge UI * add comments * fix comments * small fine tune * fix tests * adopt new pull default messages * clean up Co-authored-by: 6543 <6543@obermui.de>
lunny
added a commit
that referenced
this pull request
Feb 21, 2023
Regression bug of #19650 Close #20983 Close #21912 ### The "Manually Merged" form  ### Mark a PR as Manually Merged and close it  --------- Co-authored-by: Jason Song <i@wolfogre.com> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR would help
to get a clear code base.
And this PR use real code to show how to rewrite UI to Vue
At the moment, to keep the UI the same, some Fomantic UI styles are still being used.
I just did some simple tests, it should work as expected. Feel free to report bugs or edit on this PR directly.