Adding upcoming gauges query (backport #1195)

[mergify]

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

On branch mergify/bp/v7.x/pr-1195
Your branch is up to date with 'origin/v7.x'.

You are currently cherry-picking commit eb39af7.
  (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:   proto/osmosis/incentives/query.proto
	modified:   x/incentives/client/cli/cli_test.go
	modified:   x/incentives/keeper/grpc_query_test.go
	modified:   x/incentives/types/query.pb.go
	modified:   x/incentives/types/query.pb.gw.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/core/proto-docs.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   proto/osmosis/gamm/v1beta1/query.proto
	both modified:   x/gamm/types/query.pb.go
	both modified:   x/incentives/client/cli/query.go
	both modified:   x/incentives/keeper/grpc_query.go

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

[codecov-commenter]

Codecov Report

Merging #1257 (3cfd49b) into v7.x (523ed35) will decrease coverage by 0.22%.
The diff coverage is 3.00%.

@@            Coverage Diff             @@
##             v7.x    #1257      +/-   ##
==========================================
- Coverage   20.86%   20.63%   -0.23%     
==========================================
  Files         199      199              
  Lines       25416    25803     +387     
==========================================
+ Hits         5303     5325      +22     
- Misses      19150    19509     +359     
- Partials      963      969       +6     

Impacted Files	Coverage Δ
x/incentives/client/cli/query.go	0.00% <0.00%> (ø)
x/incentives/keeper/query.go	0.00% <ø> (ø)
x/incentives/types/query.pb.gw.go	0.00% <0.00%> (ø)
x/incentives/types/query.pb.go	0.81% <0.63%> (-0.03%)	⬇️
x/incentives/keeper/grpc_query.go	63.80% <50.00%> (+8.51%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 523ed35...3cfd49b. Read the comment docs.

[alexanderbez]

@xBalbinus can you address the conflicts here and we can get this backported :)

[xBalbinus]

hmm! fixed the weird conflicts, I think - let me know if this is good or if it didn't work.

[ValarDragon]

err, I'm pretty sure that last commit didn't fix the conflicts. It looks like maybe main got merged in?

I suggest we undo that last commit

[xBalbinus]

Oh shoot okay, let’s undo that…

…

On Mon, Apr 18, 2022 at 11:05 AM Dev Ojha ***@***.***> wrote: err, I'm pretty sure that last commit didn't fix the conflicts. It looks like maybe main got merged in? I suggest we undo that last commit — Reply to this email directly, view it on GitHub <#1257 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ASH4FPU7HGLWNCCVNBKK66DVFV22JANCNFSM5TPMSMVQ> . You are receiving this because you were mentioned.Message ID: ***@***.***>