Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Torrent extension bad merge #13268

Closed
NejcZdovc opened this issue Feb 23, 2018 · 1 comment
Closed

Torrent extension bad merge #13268

NejcZdovc opened this issue Feb 23, 2018 · 1 comment
Assignees
@NejcZdovc
Labels
feature/torrent QA/checked-Linux QA/checked-macOS QA/checked-Win64 QA/test-plan-specified release-notes/exclude
Milestone
0.22.x (Release C...

Comments

@NejcZdovc
Copy link
Contributor

NejcZdovc commented Feb 23, 2018 •
edited by srirambv
Loading

Test Plan

#13269

Description

There was a bad merge which created this situation

browser-laptop/app/filtering.js

Line 779 in 12aa8bb

if (resourceName === 'webtorrent') {

Second if statement is not reachable
@NejcZdovc NejcZdovc added this to the 0.21.x (Beta Channel) milestone Feb 23, 2018
@NejcZdovc NejcZdovc self-assigned this Feb 23, 2018
NejcZdovc added a commit to NejcZdovc/browser-laptop that referenced this issue Feb 23, 2018
@NejcZdovc
Fixes torrent merge
c050f3b 
Resolves brave#13268

Auditors:

Test Plan:
@NejcZdovc NejcZdovc mentioned this issue Feb 23, 2018
Merged
10 tasks
bsclifton added a commit that referenced this issue Feb 23, 2018
@bsclifton
Merge pull request #13269 from NejcZdovc/hotfix/#13268-merge
989a53e 
Fixes torrent merge
bsclifton added a commit that referenced this issue Feb 23, 2018
@bsclifton
Merge pull request #13269 from NejcZdovc/hotfix/#13268-merge
745d169 
Fixes torrent merge
bsclifton added a commit that referenced this issue Feb 23, 2018
@bsclifton
Merge pull request #13269 from NejcZdovc/hotfix/#13268-merge
9975c0a 
Fixes torrent merge
ryanml pushed a commit to ryanml/browser-laptop that referenced this issue Feb 27, 2018
@NejcZdovc @ryanml
Fixes torrent merge
b8980ef 
Resolves brave#13268

Auditors:

Test Plan:
This was referenced Mar 22, 2018
Closed
Closed
Closed
@srirambv
Copy link
Collaborator

srirambv commented Mar 22, 2018 •
edited by kjozwiak
Loading

Verified on Windows x64

  • 0.22.6 e6ff4ea
  • libchromiumcontent: 65.0.3325.162
  • muon: 5.1.0

Verified on Ubuntu 10.10 x64

  • 0.22.6 e6ff4ea
  • libchromiumcontent: 65.0.3325.162
  • muon: 5.1.0

Verified on macOS 10.13.3 x64 using the following build:

  • 0.22.7 8bb7e77
  • libchromiumcontent: 65.0.3325.181
  • muon: 5.1.1

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@NejcZdovc NejcZdovc

Labels
feature/torrent QA/checked-Linux QA/checked-macOS QA/checked-Win64 QA/test-plan-specified release-notes/exclude
Projects
None yet
Milestone
0.22.x (Release Channel)
Development

No branches or pull requests
4 participants
@kjozwiak @NejcZdovc @srirambv @btlechowski