search

wireapp / wire-webapp

👽 Wire for web
https://app.wire.com
GNU General Public License v3.0
1.14k stars 290 forks source link

runfix: reinstate missing commits lost in conflict resolution #17803

Closed V-Gira closed 3 months ago

V-Gira commented 3 months ago

Description

Conflict resolution for reverting changes to the minimized call ui here https://github.com/wireapp/wire-webapp/pull/17696/ reverted some previous changes by mistake

Two of those were reinstated here https://github.com/wireapp/wire-webapp/pull/17763 and here https://github.com/wireapp/wire-webapp/pull/17777

this restores https://github.com/wireapp/wire-webapp/pull/17683 and https://github.com/wireapp/wire-webapp/pull/17685

sonarcloud[bot] commented 3 months ago

Quality Gate Passed Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

codecov-commenter commented 3 months ago

Codecov Report

Attention: Patch coverage is 50.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 46.26%. Comparing base (78f4956) to head (15bc746).

Additional details and impacted files ```diff @@ Coverage Diff @@ ## dev #17803 +/- ## ========================================== - Coverage 46.26% 46.26% -0.01% ========================================== Files 770 770 Lines 25157 25157 Branches 5751 5751 ========================================== - Hits 11639 11638 -1 Misses 12046 12046 - Partials 1472 1473 +1 ```