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

Don't render dropdown when only 1 merge style is available #13670

Merged
merged 1 commit into from
Nov 22, 2020
Merged

Don't render dropdown when only 1 merge style is available #13670

merged 1 commit into from
Nov 22, 2020

Conversation

jpraet
Copy link
Member

@jpraet jpraet commented Nov 22, 2020 •
edited by lafriks
Loading

Fixes #13660

@lafriks lafriks added the topic/ui Change the appearance of the Gitea UI label Nov 22, 2020
@lafriks lafriks added this to the 1.14.0 milestone Nov 22, 2020
@lafriks lafriks changed the title don't render dropdown when only 1 merge style is available (#13660) don't render dropdown when only 1 merge style is available Nov 22, 2020
@lafriks lafriks changed the title don't render dropdown when only 1 merge style is available Don't render dropdown when only 1 merge style is available Nov 22, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Nov 22, 2020
a1012112796
a1012112796 approved these changes Nov 22, 2020
View reviewed changes
Copy link
Member

@a1012112796 a1012112796 left a comment

Choose a reason for hiding this comment

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

I think so.

@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 Nov 22, 2020
@codecov-io
Copy link

Codecov Report

Merging #13670 (a261008) into master (b651409) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #13670   +/-   ##
=======================================
  Coverage   42.24%   42.24%           
=======================================
  Files         697      697           
  Lines       76576    76596   +20     
=======================================
+ Hits        32346    32356   +10     
- Misses      38914    38925   +11     
+ Partials     5316     5315    -1
Impacted Files Coverage Δ
models/repo_unit.go 86.48% <100.00%> (+2.35%) ⬆️
modules/util/timer.go 42.85% <0.00%> (-42.86%) ⬇️
services/pull/temp_repo.go 26.59% <0.00%> (-3.20%) ⬇️
services/pull/check.go 48.90% <0.00%> (-2.92%) ⬇️
models/unit.go 46.57% <0.00%> (-2.74%) ⬇️
services/pull/patch.go 53.97% <0.00%> (-1.71%) ⬇️
modules/queue/workerpool.go 58.77% <0.00%> (-1.23%) ⬇️
services/gitdiff/gitdiff.go 69.05% <0.00%> (+1.33%) ⬆️
modules/queue/unique_queue_disk_channel.go 55.38% <0.00%> (+1.53%) ⬆️
modules/log/file.go 75.20% <0.00%> (+1.60%) ⬆️

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 b651409...a261008. Read the comment docs.

@lafriks lafriks merged commit 2791cc1 into go-gitea:master Nov 22, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@a1012112796 a1012112796 a1012112796 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

Don't show a dropdown menu when only 1 merge option is available
5 participants
@jpraet @codecov-io @lafriks @a1012112796 @GiteaBot