Skip to content
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

Use Vue to refactor pull merge UI #19650

Merged
merged 16 commits into from
May 12, 2022
Merged

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented May 7, 2022

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.

@wxiaoguang wxiaoguang added topic/ui Change the appearance of the Gitea UI type/refactoring Existing code has been cleaned up. There should be no new functionality. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels May 7, 2022
@wxiaoguang wxiaoguang added this to the 1.17.0 milestone May 7, 2022
@6543

This comment was marked as resolved.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 7, 2022
@wxiaoguang
Copy link
Contributor Author

@6543 I am cleaning comments, the eslint and script-module cann't work together. pull & try again.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 7, 2022
@6543
Copy link
Member

6543 commented May 8, 2022

@wxiaoguang please resolve config

@wxiaoguang
Copy link
Contributor Author

Need to confirm a change first: https://github.com/go-gitea/gitea/pull/18177/files#r867490307

wxiaoguang added 2 commits May 8, 2022 21:40
# Conflicts:
#	templates/repo/issue/view_content/pull.tmpl
@wxiaoguang
Copy link
Contributor Author

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.

@duhanmin
Copy link

duhanmin commented May 9, 2022

@wxiaoguang Merge conflict resolution?

@codecov-commenter

This comment was marked as off-topic.

@GiteaBot 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 May 12, 2022
@lunny lunny merged commit 368baf9 into go-gitea:main May 12, 2022
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
@wxiaoguang wxiaoguang deleted the refactor-pull-merge-ui branch May 12, 2022 16:01
@6543 6543 mentioned this pull request Jun 19, 2022
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

![image](https://user-images.githubusercontent.com/2114189/220170503-32638994-b509-4251-8aa1-d8393dda7184.png)

### Mark a PR as Manually Merged and close it

![image](https://user-images.githubusercontent.com/2114189/220170537-25c91b2c-7a9a-44d1-9e6a-ebe3f1dfc26a.png)

---------

Co-authored-by: Jason Song <i@wolfogre.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
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/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants