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

disable url parameter in swagger-ui page (backport #11202) #11207

Merged
merged 3 commits into from
Feb 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 16, 2022

This is an automatic backport of pull request #11202 done by Mergify.
Cherry-pick of cb6fea9 has failed:

On branch mergify/bp/release/v0.45.x/pr-11202
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit cb6fea997.
  (fix conflicts and 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)

Changes to be committed:
	modified:   client/docs/swagger-ui/index.html
	new file:   scripts/update-swagger-ui-statik.sh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   client/docs/statik/statik.go
	both modified:   client/docs/swagger-ui/swagger-ui-bundle.js
	deleted by us:   client/docs/swagger-ui/swagger-ui-bundle.js.map
	deleted by us:   client/docs/swagger-ui/swagger-ui-es-bundle-core.js
	deleted by us:   client/docs/swagger-ui/swagger-ui-es-bundle-core.js.map
	deleted by us:   client/docs/swagger-ui/swagger-ui-es-bundle.js
	deleted by us:   client/docs/swagger-ui/swagger-ui-es-bundle.js.map
	both modified:   client/docs/swagger-ui/swagger-ui-standalone-preset.js
	deleted by us:   client/docs/swagger-ui/swagger-ui-standalone-preset.js.map
	deleted by us:   client/docs/swagger-ui/swagger-ui.js
	deleted by us:   client/docs/swagger-ui/swagger-ui.js.map

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Closes: #11201
Solution:
- update swagger-ui to recent release
- add option `queryConfigEnabled: false`

(cherry picked from commit cb6fea9)

# Conflicts:
#	client/docs/statik/statik.go
#	client/docs/swagger-ui/swagger-ui-bundle.js
#	client/docs/swagger-ui/swagger-ui-bundle.js.map
#	client/docs/swagger-ui/swagger-ui-es-bundle-core.js
#	client/docs/swagger-ui/swagger-ui-es-bundle-core.js.map
#	client/docs/swagger-ui/swagger-ui-es-bundle.js
#	client/docs/swagger-ui/swagger-ui-es-bundle.js.map
#	client/docs/swagger-ui/swagger-ui-standalone-preset.js
#	client/docs/swagger-ui/swagger-ui-standalone-preset.js.map
#	client/docs/swagger-ui/swagger-ui.js
#	client/docs/swagger-ui/swagger-ui.js.map
@tac0turtle
Copy link
Member

@yihuang can you verify this? I accepted incoming changes the amount of changed code went up

@yihuang
Copy link
Collaborator

yihuang commented Feb 17, 2022

@yihuang can you verify this? I accepted incoming changes the amount of changed code went up

I override with swagger-ui released files, there are changes in several files.

@yihuang
Copy link
Collaborator

yihuang commented Feb 18, 2022

@yihuang can you verify this? I accepted incoming changes the amount of changed code went up

I override with swagger-ui released files, there are changes in several files.

How can I push to this branch? maybe open a separated backport PR?

@tac0turtle
Copy link
Member

I created a crypto.com team and invited you there, after joining you should have write permission

@yihuang
Copy link
Collaborator

yihuang commented Feb 18, 2022

I created a crypto.com team and invited you there, after joining you should have write permission

done, I pushed.

@tac0turtle tac0turtle merged commit 4368a18 into release/v0.45.x Feb 21, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-11202 branch February 21, 2022 10:53
@faddat faddat mentioned this pull request Feb 28, 2022
8 tasks
JimLarson pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Jul 7, 2022
…mos#11207)

* disable url parameter in swagger-ui page (cosmos#11202)

Closes: cosmos#11201
Solution:
- update swagger-ui to recent release
- add option `queryConfigEnabled: false`

(cherry picked from commit cb6fea9)

# Conflicts:
#	client/docs/statik/statik.go
#	client/docs/swagger-ui/swagger-ui-bundle.js
#	client/docs/swagger-ui/swagger-ui-bundle.js.map
#	client/docs/swagger-ui/swagger-ui-es-bundle-core.js
#	client/docs/swagger-ui/swagger-ui-es-bundle-core.js.map
#	client/docs/swagger-ui/swagger-ui-es-bundle.js
#	client/docs/swagger-ui/swagger-ui-es-bundle.js.map
#	client/docs/swagger-ui/swagger-ui-standalone-preset.js
#	client/docs/swagger-ui/swagger-ui-standalone-preset.js.map
#	client/docs/swagger-ui/swagger-ui.js
#	client/docs/swagger-ui/swagger-ui.js.map

* fix conflicts

* override swagger-ui after resolve conflicts

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
…mos#11207)

* disable url parameter in swagger-ui page (cosmos#11202)

Closes: cosmos#11201
Solution:
- update swagger-ui to recent release
- add option `queryConfigEnabled: false`

(cherry picked from commit cb6fea9)

# Conflicts:
#	client/docs/statik/statik.go
#	client/docs/swagger-ui/swagger-ui-bundle.js
#	client/docs/swagger-ui/swagger-ui-bundle.js.map
#	client/docs/swagger-ui/swagger-ui-es-bundle-core.js
#	client/docs/swagger-ui/swagger-ui-es-bundle-core.js.map
#	client/docs/swagger-ui/swagger-ui-es-bundle.js
#	client/docs/swagger-ui/swagger-ui-es-bundle.js.map
#	client/docs/swagger-ui/swagger-ui-standalone-preset.js
#	client/docs/swagger-ui/swagger-ui-standalone-preset.js.map
#	client/docs/swagger-ui/swagger-ui.js
#	client/docs/swagger-ui/swagger-ui.js.map

* fix conflicts

* override swagger-ui after resolve conflicts

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
…mos#11207)

* disable url parameter in swagger-ui page (cosmos#11202)

Closes: cosmos#11201
Solution:
- update swagger-ui to recent release
- add option `queryConfigEnabled: false`

(cherry picked from commit cb6fea9)

# Conflicts:
#	client/docs/statik/statik.go
#	client/docs/swagger-ui/swagger-ui-bundle.js
#	client/docs/swagger-ui/swagger-ui-bundle.js.map
#	client/docs/swagger-ui/swagger-ui-es-bundle-core.js
#	client/docs/swagger-ui/swagger-ui-es-bundle-core.js.map
#	client/docs/swagger-ui/swagger-ui-es-bundle.js
#	client/docs/swagger-ui/swagger-ui-es-bundle.js.map
#	client/docs/swagger-ui/swagger-ui-standalone-preset.js
#	client/docs/swagger-ui/swagger-ui-standalone-preset.js.map
#	client/docs/swagger-ui/swagger-ui.js
#	client/docs/swagger-ui/swagger-ui.js.map

* fix conflicts

* override swagger-ui after resolve conflicts

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
…mos#11207)

* disable url parameter in swagger-ui page (cosmos#11202)

Closes: cosmos#11201
Solution:
- update swagger-ui to recent release
- add option `queryConfigEnabled: false`

(cherry picked from commit cb6fea9)

* fix conflicts

* override swagger-ui after resolve conflicts

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants