The Wayback Machine - https://web.archive.org/web/20220801075121/https://github.com/go-gitea/gitea/pull/17624
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

Jump to bottom

Custom regexp external issues #17624

Merged
merged 18 commits into from Jun 10, 2022
Merged

Custom regexp external issues #17624

merged 18 commits into from Jun 10, 2022

Conversation

strk
Copy link
Member

@strk strk commented Nov 12, 2021

This is a rebased version of #4265 with conflicts resolved.

\cc @AlexanderBeyn

Supposedly fixes #3468 but I did not test as I'm currently unable to build Gitea (due to too new Go compiler dependency)

@strk strk mentioned this pull request Nov 12, 2021
Closed
@strk strk force-pushed the custom-regexp-external-issues branch from 1ee37f3 to 0220b5a Compare Nov 12, 2021
@strk strk force-pushed the custom-regexp-external-issues branch 4 times, most recently from 312bff1 to 32baeea Compare Nov 12, 2021
@strk strk force-pushed the custom-regexp-external-issues branch from 32baeea to b5f0048 Compare Nov 12, 2021
@strk strk force-pushed the custom-regexp-external-issues branch 2 times, most recently from ff7986f to cece1d5 Compare Nov 12, 2021
@strk strk force-pushed the custom-regexp-external-issues branch from cece1d5 to 7ac7a0e Compare Nov 12, 2021
@strk
Copy link
Member Author

@strk strk commented Nov 12, 2021

I'm letting this go for today and next few days, dunno if I'll have time to catch up again so please if @techknowlogick or @zeripath want to continue from here I'm happy :)

@6543 6543 added this to the 1.17.0 milestone May 7, 2022
@6543
Copy link
Member

@6543 6543 commented May 7, 2022

@strk can you enable maintainers to edit this pull - or resolve conflicts :)

@strk
Copy link
Member Author

@strk strk commented May 9, 2022

"Allow edits by maintainers" is checked already

@6543
Copy link
Member

@6543 6543 commented May 9, 2022

hmm strange - I can't push to the pull head

@strk
Copy link
Member Author

@strk strk commented May 9, 2022

I'm afraid github concept of "maintainer" is different from Gitea one. For GitHub, "maintainers" are those with "write access to repository". I know I'm a Gitea mintainer while NOT having write access to it. Feel free to take over this PR by creating a new one, or send a pull request for my fork

@6543
Copy link
Member

@6543 6543 commented May 9, 2022

well I do have write-access ... tldr: I'll create a pull

@luiscla27
Copy link

@luiscla27 luiscla27 commented May 26, 2022

How is this going? :)

@6543
Copy link
Member

@6543 6543 commented May 29, 2022

thanks for the ping ;)

@6543
Copy link
Member

@6543 6543 commented May 29, 2022

@strk strk#2

@strk
Copy link
Member Author

@strk strk commented Jun 9, 2022

@wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jun 9, 2022

Maybe you could do a do-release-upgrade, instead of using a EOL distro without security patches.

https://ubuntu.com/about/release-cycle , https://wiki.ubuntu.com/Releases

Version Code name Release End of Life
Ubuntu 21.04 Hirsute Hippo April 22, 2021 January 20, 2022

@wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jun 9, 2022 •
edited

IMO this PR can not be ready for 1.17 release.

Update: still trying to fix tests .....

Update: almost done.

  1. Some logic was incorrect: fixed
  2. Some code seems incomplete: fixed
  3. Some design problems: change test code and define rules.
    • If users try to use ISSUE-(\d+) as the expression, then what is the final URL? /xxx/ISSUE-123 or /xxx/123?
    • Then, if users try to use (ISSUE-(\d+)) as the expression, what will the final URL be? The rules conflict
    • solution: only use the first matched group for URL
      • ISSUE-(\d+) => '/xxxx/123'
      • (ISSUE-(\d+)) => '/xxxx/ISSUE-123'
      • in the future, more rules can be added to use other capture groups (maybe '/xxxx/$1-$2', but it seems not necessary at the moment)

@wxiaoguang wxiaoguang force-pushed the custom-regexp-external-issues branch from 6d21a64 to 0b88fbc Compare Jun 9, 2022
@wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jun 9, 2022

OK, CI passes, and the frontend has been refactored together.

Maybe it's possible to get it in 1.17

wxiaoguang
wxiaoguang approved these changes Jun 9, 2022
View changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

I did a quick test, it works.

@wxiaoguang wxiaoguang force-pushed the custom-regexp-external-issues branch from 5572f99 to 94c4953 Compare Jun 9, 2022
6543
6543 reviewed Jun 9, 2022
View changes
modules/markup/html_internal_test.go Outdated Show resolved Hide resolved
@silverwind
Copy link
Member

@silverwind silverwind commented Jun 9, 2022 •
edited

Maybe you could do a do-release-upgrade, instead of using a EOL distro without security patches.

https://ubuntu.com/about/release-cycle , https://wiki.ubuntu.com/Releases
Version Code name Release End of Life
Ubuntu 21.04 Hirsute Hippo April 22, 2021 January 20, 2022

Or just use the official nodesource repo which is much better than the EOL versions that are in base Debian/Ubuntu repos.

@6543 6543 requested a review from silverwind Jun 10, 2022
6543
6543 approved these changes Jun 10, 2022
View changes
@lunny
Copy link
Member

@lunny lunny commented Jun 10, 2022

make L-G-T-M work.

@lunny lunny merged commit 52c2e82 into go-gitea:main Jun 10, 2022
2 checks passed
@strk
Copy link
Member Author

@strk strk commented Jun 10, 2022

zjjhot added a commit to zjjhot/gitea that referenced this issue Jun 11, 2022
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
4ae06ff 
* giteaoffical/main:
  Fix data-race problems in git module (quick patch) (go-gitea#19934)
  [skip ci] Updated translations via Crowdin
  Fix copy/paste of empty lines (go-gitea#19798)
  Normalize line endings in fomantic build files (go-gitea#19932)
  Make user profile image show full image on mobile (go-gitea#19840)
  Custom regexp external issues (go-gitea#17624)
  Use Golang 1.18 for Gitea 1.17 release (go-gitea#19918)
  Refactor git module, make Gitea use internal git config (go-gitea#19732)
  [skip ci] Updated translations via Crowdin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang

@6543 6543

@silverwind silverwind

Assignees
No one assigned
Labels
changelog kind/enhancement lgtm/done
Milestone
1.17.0
Development

Successfully merging this pull request may close these issues.

Allow custom regex patterns for linking external issues
10 participants
@strk @6543 @luiscla27 @lunny @wxiaoguang @silverwind @GiteaBot @AlexanderBeyn @techknowlogick @lafriks