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

Add pull request manually merge instruction #13840

Merged
merged 10 commits into from Dec 10, 2020
Merged

Add pull request manually merge instruction #13840

merged 10 commits into from Dec 10, 2020

Conversation

lunny
Copy link
Member

@lunny lunny commented Dec 4, 2020 •
edited

default theme

image

arc-green theme

image

@lunny lunny added the type/enhancement An improvement of existing functionality label Dec 4, 2020
@lunny lunny added this to the 1.14.0 milestone Dec 4, 2020
@6543
Copy link
Member

6543 commented Dec 4, 2020

If tea would work properly - we could also mention it ...

but we should imprufe tea pr checkout first

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 4, 2020
@codecov-io
Copy link

codecov-io commented Dec 4, 2020 •
edited

Codecov Report

Merging #13840 (56a9e68) into master (c85bb62) will increase coverage by 0.08%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13840      +/-   ##
==========================================
+ Coverage   42.11%   42.20%   +0.08%     
==========================================
  Files         710      710              
  Lines       77227    77227              
==========================================
+ Hits        32527    32596      +69     
+ Misses      39350    39258      -92     
- Partials     5350     5373      +23
Impacted Files Coverage Δ
models/repo_mirror.go 2.38% <0.00%> (-11.91%) ⬇️
modules/cron/tasks_basic.go 87.35% <0.00%> (-3.45%) ⬇️
services/pull/check.go 48.90% <0.00%> (-2.19%) ⬇️
services/mirror/mirror.go 15.78% <0.00%> (-1.11%) ⬇️
modules/git/repo.go 45.72% <0.00%> (-1.01%) ⬇️
models/error.go 38.49% <0.00%> (-0.49%) ⬇️
services/pull/pull.go 41.17% <0.00%> (+0.98%) ⬆️
services/mailer/mail.go 61.29% <0.00%> (+1.07%) ⬆️
modules/log/event.go 61.79% <0.00%> (+1.88%) ⬆️
modules/process/manager.go 75.00% <0.00%> (+2.50%) ⬆️
... and 7 more

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 c85bb62...56a9e68. Read the comment docs.

@lunny lunny changed the title WIP: Add pull request manually merge instuction Add pull request manually merge instruction Dec 5, 2020
silverwind
silverwind reviewed Dec 5, 2020
View reviewed changes
web_src/js/index.js
$('.show-instruction').on('click', () => {
$('.instruct').toggle();
});
}
Copy link
Member

@silverwind silverwind Dec 5, 2020 •
edited

Choose a reason for hiding this comment

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

Could do this without any JS by using the <details> and <summary> elements.

https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, it is. But the arrow is not that suitable here.

Copy link
Member

Choose a reason for hiding this comment

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

You mean the triangle? That can be hidden:

https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details#Customizing_the_disclosure_widget

Copy link
Member Author

Choose a reason for hiding this comment

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

This is difficult to me and I will left this for other PRs.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah I guess it may be hard to have it only trigger from the link element.

@CirnoT
Copy link
Contributor

CirnoT commented Dec 5, 2020

Can the 'You can view command line instructions' be moved a bit from the button? It seems cramped to me to have it so close.

@lunny lunny force-pushed the lunny/pr_cmd_instruction2 branch 2 times, most recently from 37c6770 to 3ec9353 Compare December 6, 2020 13:54
@lunny
Copy link
Member Author

lunny commented Dec 6, 2020

@CirnoT @silverwind Done.

@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 Dec 9, 2020
@silverwind
Copy link
Member

It regresses the frontpage search box:

image

I'll see if I can come up with some better CSS.

@silverwind
Copy link
Member

Please pull in silverwind@d1fa043, I think it's a good compromise.

Screen Shot 2020-12-09 at 20 42 15

Screen Shot 2020-12-09 at 20 42 34

Screen Shot 2020-12-09 at 20 42 50

Screen Shot 2020-12-09 at 20 42 56

@silverwind
Copy link
Member

Also pull in silverwind@35f7eed. It just removes that background on the search box. I think it looks better without it and we can use a deeper dark on those instructions.

Screen Shot 2020-12-09 at 20 48 04

Screen Shot 2020-12-09 at 20 47 52

Screen Shot 2020-12-09 at 20 49 13

@lunny
Copy link
Member Author

lunny commented Dec 10, 2020

@silverwind Done.

@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 Dec 10, 2020
@6543 6543 merged commit 2d71cdb into go-gitea:master Dec 10, 2020
@lunny lunny deleted the lunny/pr_cmd_instruction2 branch December 10, 2020 09:17
@CirnoT CirnoT mentioned this pull request Dec 12, 2020
Merged
@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

@silverwind silverwind silverwind approved these changes

@6543 6543 6543 approved these changes

@gary-kim gary-kim gary-kim 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. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@lunny @6543 @codecov-io @CirnoT @silverwind @gary-kim @GiteaBot