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.

Sign up for GitHub

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

Fix blank dir message when uploading files from web editor #25391

Merged
merged 3 commits into from Jun 20, 2023
Merged

Fix blank dir message when uploading files from web editor #25391

merged 3 commits into from Jun 20, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Jun 20, 2023

Fix #7883

@lunny lunny added the topic/ui-interaction Change the process how users use Gitea instead of the visual appearance label Jun 20, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 20, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 20, 2023
delvh
delvh approved these changes Jun 20, 2023
View reviewed changes
Copy link
Member

@delvh delvh left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That 5 line fix took three years to resolve? 👀

routers/web/repo/editor.go Show resolved Hide resolved
@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 Jun 20, 2023
@lunny lunny added the backport/v1.20 This PR should be backported to Gitea 1.20 label Jun 20, 2023
@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 Jun 20, 2023
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 20, 2023
@silverwind silverwind enabled auto-merge (squash) June 20, 2023 19:06
@silverwind
Copy link
Member

That 5 line fix took three years to resolve? 👀

Better late than never 😆

@silverwind silverwind merged commit 54259db into go-gitea:main Jun 20, 2023
23 checks passed
@GiteaBot GiteaBot added this to the 1.21.0 milestone Jun 20, 2023
@GiteaBot GiteaBot mentioned this pull request Jun 20, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jun 20, 2023
@lunny @GiteaBot
Fix blank dir message when uploading files from web editor (go-gitea#…
35aef26 
…25391)

Fix go-gitea#7883
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jun 20, 2023
silverwind pushed a commit that referenced this pull request Jun 20, 2023
@GiteaBot @lunny
Fix blank dir message when uploading files from web editor (#25391) (#…
4908cc9 
…25400)

Backport #25391 by @lunny

Fix #7883

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 21, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
3e8a29d 
* giteaofficial/main:
  Refactor path & config system (go-gitea#25330)
  Add actor and status dropdowns to run list (go-gitea#25118)
  Use the new download domain replace the old (go-gitea#25405)
  Avoid polluting config file when "save" (go-gitea#25395)
  Fix dropdown icon layout on diff page (go-gitea#25397)
  Support configuration variables on Gitea Actions (go-gitea#24724)
  Substitute variables in path names of template repos too (go-gitea#25294)
  Navbar styling rework (go-gitea#25343)
  Fix blank dir message when uploading files from web editor (go-gitea#25391)
  Add git-lfs support to devcontainer (go-gitea#25385)
  Use qwtel.sqlite-viewer instead of alexcvzz.vscode-sqlite (go-gitea#25386)
  Use Actions git context instead of dynamically created buildkit one (go-gitea#25381)
  rename tributeValues to mentionValues (go-gitea#25375)
  Fix LDAP sync when Username Attribute is empty (go-gitea#25278)
  Fetch all git data for embedding correct version in docker image (go-gitea#25361)
  Fix sidebar label dropdown divider (go-gitea#25359)
  Fix issue filters on mobile view (go-gitea#25368)
  Refactor: TotalTimest return seconds (go-gitea#25370)
silverwind added a commit to silverwind/gitea that referenced this pull request Jun 21, 2023
@silverwind
Merge remote-tracking branch 'origin/main' into uitweaks2
e9a5783 
* origin/main: (47 commits)
  Move some regexp out of functions (go-gitea#25430)
  Show outdated comments in files changed tab (go-gitea#24936)
  Remove "CHARSET" config option for MySQL, always use "utf8mb4" (go-gitea#25413)
  Fine tune project board label colors and modal content background (go-gitea#25419)
  Fix missing commit message body when the message has leading newlines (go-gitea#25418)
  add python/poetry to devcontainer (go-gitea#25407)
  Refactor path & config system (go-gitea#25330)
  Add actor and status dropdowns to run list (go-gitea#25118)
  Use the new download domain replace the old (go-gitea#25405)
  Avoid polluting config file when "save" (go-gitea#25395)
  Fix dropdown icon layout on diff page (go-gitea#25397)
  Support configuration variables on Gitea Actions (go-gitea#24724)
  Substitute variables in path names of template repos too (go-gitea#25294)
  Navbar styling rework (go-gitea#25343)
  Fix blank dir message when uploading files from web editor (go-gitea#25391)
  Add git-lfs support to devcontainer (go-gitea#25385)
  Use qwtel.sqlite-viewer instead of alexcvzz.vscode-sqlite (go-gitea#25386)
  Use Actions git context instead of dynamically created buildkit one (go-gitea#25381)
  rename tributeValues to mentionValues (go-gitea#25375)
  Fix LDAP sync when Username Attribute is empty (go-gitea#25278)
  ...
@lunny lunny deleted the lunny/fix_web_editor_commit_message branch August 24, 2023 12:45
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 18, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. topic/ui-interaction Change the process how users use Gitea instead of the visual appearance
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

Bad default commit message of file upload in root directory
4 participants
@lunny @silverwind @delvh @GiteaBot