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

Automated cherry pick of #877: fix: nginx.conf change #879

Conversation

erda-bot
Copy link
Member

@erda-bot erda-bot commented Aug 6, 2021

Cherry pick of #877 on release/1.1.

Squashed commit message:

commit 2cdf2c546341b99afdc91db085579f012218952f
Author: hujiahao-hjh <82502479+hujiahao-hjh@users.noreply.github.com>
Date:   Fri Aug 6 16:22:15 2021 +0800

    fix: nginx.conf change (#877)

What this PR does / why we need it:

nginx.conf change.

Does this PR introduce a user interface change?

❎ No

ChangeLog

Language Changelog
🇺🇸 English Fixed bug where Git repository can be cloned without password.
🇨🇳 中文 修复了git仓库不用账号密码也能clone的bug。

Does this PR need be patched to older version?

✅ Yes(version is required)
release/1.1

Which issue(s) this PR fixes:

Fixes # nginx.conf change

@erda-bot erda-bot added the auto-cherry-pick Auto tagged by robot label Aug 6, 2021
@laojun laojun merged commit 1df827b into erda-project:release/1.1 Aug 6, 2021
@laojun
Copy link
Contributor

laojun commented Aug 6, 2021

/cherry-pick release/1.1

@erda-bot
Copy link
Member Author

erda-bot commented Aug 6, 2021

Automated cherry pick failed, please resolve the confilcts and create PR manually.
Details:

On branch auto-cherry-pick-pr/879-366936366493217407
You are currently cherry-picking commit 1df827b3.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	__cherry_pick_failed_detail.txt

nothing added to commit but untracked files present (use "git add" to track)

@laojun
Copy link
Contributor

laojun commented Aug 6, 2021

/cherry-pick release/1.2

erda-bot added a commit to erda-bot/erda-ui that referenced this pull request Aug 6, 2021
Co-authored-by: hujiahao-hjh <82502479+hujiahao-hjh@users.noreply.github.com>
laojun pushed a commit that referenced this pull request Aug 6, 2021
Co-authored-by: hujiahao-hjh <82502479+hujiahao-hjh@users.noreply.github.com>

Co-authored-by: hujiahao-hjh <82502479+hujiahao-hjh@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-cherry-pick Auto tagged by robot
Development

Successfully merging this pull request may close these issues.

None yet

3 participants