Skip to content

Conversation

a1012112796
Copy link
Member

I 'm sorry, I only add - befor if to make them in one line but forget to add enough space in #10737. now fix it.

fix #10973

that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <[email protected]>
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 5, 2020
@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 Apr 5, 2020
@lafriks lafriks added the topic/ui Change the appearance of the Gitea UI label Apr 5, 2020
@lafriks lafriks added this to the 1.12.0 milestone Apr 5, 2020
@lafriks lafriks added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 5, 2020
@codecov-io
Copy link

Codecov Report

Merging #10974 into master will decrease coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #10974      +/-   ##
==========================================
- Coverage   43.62%   43.57%   -0.06%     
==========================================
  Files         597      597              
  Lines       83923    83923              
==========================================
- Hits        36611    36567      -44     
- Misses      42802    42852      +50     
+ Partials     4510     4504       -6     
Impacted Files Coverage Δ
services/pull/check.go 32.92% <0.00%> (-17.08%) ⬇️
models/repo_indexer.go 77.94% <0.00%> (-4.42%) ⬇️
models/repo_language_stats.go 70.78% <0.00%> (-3.38%) ⬇️
models/unit.go 41.97% <0.00%> (-2.47%) ⬇️
modules/queue/workerpool.go 56.93% <0.00%> (-1.07%) ⬇️
modules/log/event.go 64.61% <0.00%> (-1.03%) ⬇️
models/pull.go 42.30% <0.00%> (-0.56%) ⬇️

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 686850e...3049f77. Read the comment docs.

@lafriks lafriks merged commit 9814dd6 into go-gitea:master Apr 5, 2020
everhopingandwaiting pushed a commit to everhopingandwaiting/gitea that referenced this pull request Apr 6, 2020
that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <[email protected]>
lafriks pushed a commit that referenced this pull request Apr 8, 2020
… merge white list (#10951)

* [suggest] change merge strategy: do not check write access if user in merge white list #10935

(cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)

* fix NPE

* Fix cross compile (#10952)

* Fix cross compile

* Add test for cross compile

* Fix drone

* Fix drone

* Also prevent CC environment not to generate

Co-authored-by: zeripath <[email protected]>

* fix merge box icon color bug (#10974)

that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <[email protected]>

* [skip ci] Updated translations via Crowdin

* Allow X in addition to x in tasks (#10979)

Signed-off-by: Andrew Thornton <[email protected]>

* remove api: merge  reqRepoWriter

Co-authored-by: zeripath <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: 赵智超 <[email protected]>
Co-authored-by: GiteaBot <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: guillep2k <[email protected]>
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
… merge white list (go-gitea#10951)

* [suggest] change merge strategy: do not check write access if user in merge white list go-gitea#10935

(cherry picked from commit ba74fc6389dfcad03c273441a49b54e4d38c86ee)

* fix NPE

* Fix cross compile (go-gitea#10952)

* Fix cross compile

* Add test for cross compile

* Fix drone

* Fix drone

* Also prevent CC environment not to generate

Co-authored-by: zeripath <[email protected]>

* fix merge box icon color bug (go-gitea#10974)

that because need some space beturn ``text`` and color defines

Signed-off-by: a1012112796 <[email protected]>

* [skip ci] Updated translations via Crowdin

* Allow X in addition to x in tasks (go-gitea#10979)

Signed-off-by: Andrew Thornton <[email protected]>

* remove api: merge  reqRepoWriter

Co-authored-by: zeripath <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: 赵智超 <[email protected]>
Co-authored-by: GiteaBot <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: guillep2k <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CSS class names concatenated together for PR merge box
5 participants