similar to T72605 can I assume that the .rubocop_todo.yml file can be dealt with in the same way?
Description
Details
Related Objects
Event Timeline
Change 176252 had a related patch set uploaded (by Stan):
fix rubocop string literal offenses
Change 176253 had a related patch set uploaded (by Stan):
mark unused argument (rubocop fix)
Change 176254 had a related patch set uploaded (by Stan):
remove non applicable private (per rubocop)
Change 176255 had a related patch set uploaded (by Stan):
rubocop line length fixes
Change 176256 had a related patch set uploaded (by Stan):
add MediaWiki standard rubocop config
Change 176257 had a related patch set uploaded (by Stan):
ignore cop because is part of module api
Change 176258 had a related patch set uploaded (by Stan):
rubocop and/or style fixes
Change 176259 had a related patch set uploaded (by Stan):
use % instead of %Q per rubocop
Change 176260 had a related patch set uploaded (by Stan):
change block comments to # comments (per rubocop)
Change 176261 had a related patch set uploaded (by Stan):
T75898: change compact style module definition to nested (per rubocop)
Change 176261 had a related patch set uploaded (by Stan):
change compact style module definition to nested (per rubocop)
Change 176275 had a related patch set uploaded (by Stan):
add basic documentation comments (per rubocop)
Change 176276 had a related patch set uploaded (by Stan):
add empty lines (per rubocop style)
Change 176279 had a related patch set uploaded (by Stan):
use guard clause per rubocop
Change 176280 had a related patch set uploaded (by Stan):
update hash syntax per rubocop
Change 176281 had a related patch set uploaded (by Stan):
indentation fix
Change 176282 had a related patch set uploaded (by Stan):
disable cop in this instance only
Change 176283 had a related patch set uploaded (by Stan):
remove nil comparison per rubocop
Stan3, I have just noticed that you have not added anybody to reviewers for your commits (so they do not show up on our Gerrit home page). Please add me, Chris and Dan, like I did for commit 176283.
Change 176338 had a related patch set uploaded (by Stan):
change delimiter for % per rubocop
Change 176339 had a related patch set uploaded (by Stan):
cop no longer firing, removing
Change 176340 had a related patch set uploaded (by Stan):
remove redundant selfs (per rubocop)
Change 176341 had a related patch set uploaded (by Stan):
correct bracket spacing per rubocop
Change 176342 had a related patch set uploaded (by Stan):
use english special globals per rubocop
Change 176343 had a related patch set uploaded (by Stan):
remove cop disable that no longer matches anything
Change 176344 had a related patch set uploaded (by Stan):
disable global cop around globals that can't easily be removed
Change 176345 had a related patch set uploaded (by Stan):
remove empty rubocop_todo
@dduvall, can we merge the changes into master? Would it make it harder for you to merge your branch with master?
Change 176343 abandoned by Stan:
remove cop disable that no longer matches anything
Reason:
change merged into commit that made the cop pass (had to go back and find it)
Change 176339 abandoned by Stan:
cop no longer firing, removing
Reason:
merge into code change that resolved cop failure
Change 176345 abandoned by Stan:
remove empty rubocop_todo
Reason:
change merged into previous
@zeljkofilipin, (Gah! Sorry, I noticed this task a bit late. I have to figure out a better filter for phab notifications...)
It's definitely going to make merging difficult. I hate to say it, but it might make sense to make these changes on the env-abstraction-layer experimental branch instead; we're bound to find minor violations there that we'll have to correct anyway.
Also, I'm wondering if we should perform future RuboCop fixes all in one patch set. The downside to that would be less traceability of each rule's acceptance and corrections; the upside would be less noise and less rebasing.
@Stan3: sorry, I think rebasing will not be possible. The env-abstraction-layer branch is a rewrite, as far as I know it shares almost no code with the original. You will have to generate the rubocop todo file for the branch and then do the cleanup. Let me know if you have any questions.
I'm hoping to get env-abstraction-layer merged this week, after which we can revisit the changes and see whether it would make more sense to rebase or start fresh.
Change 176277 had a related patch set uploaded (by Stan):
remove extra blank lines (per rubocop)
Change 179460 had a related patch set uploaded (by Stan):
regenerate rubocop todo
Change 179461 had a related patch set uploaded (by Stan):
remove comma after last item of hash (per rubocop)
Change 179462 had a related patch set uploaded (by Stan):
fullstop with method name (per rubocop)
Change 179463 had a related patch set uploaded (by Stan):
remove space inside empty braces (per rubocop)
Change 179464 had a related patch set uploaded (by Stan):
use &: style instead of block (per rubocop)
Change 176283 abandoned by Stan:
remove nil comparison per rubocop
Reason:
no longer required
Change 176341 abandoned by Stan:
correct bracket spacing per rubocop
Reason:
no longer required
Change 176338 abandoned by Stan:
change delimiter for % per rubocop
Reason:
no longer required
Change 176280 abandoned by Stan:
update hash syntax per rubocop
Reason:
no longer required
Change 176257 abandoned by Stan:
ignore cop because is part of module api
Reason:
no longer required
Change 176258 abandoned by Stan:
rubocop and/or style fixes
Reason:
no longer required
Change 176259 abandoned by Stan:
use % instead of %Q per rubocop
Reason:
no longer required
hmmm, can't seem to get gerrit to base my changes on the env-abstraction-layer branch rather than master
pushed to https://github.com/stan3/mediawiki-selenium/tree/T75898 in the mean time
@zeljkofilipin: you've spotted that https://github.com/stan3/mediawiki-selenium/tree/T75898 is branched from env-abstraction-layer?
@Stan3, sorry, did not notice that. What did you do? Why does Gerrit complain then if you are working on the same branch?
@zeljkofilipin: I cherry-picked the changes onto the new branch so change ids are the same. Maybe gerrit doesn't support that?
@Stan3, I do not think I have tried that so far, but looks like it at least confused gerrit.
You want to push your change in Gerrit with:
git push gerrit whateverlocalbranch:refs/for/env-abstraction-layer
This way Gerrit will know they are for the env-abstraction-layer branch.
It is probably better to fix the rubocop issues after the branch has been merged.
Change 179460 abandoned by Hashar:
regenerate rubocop todo
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176261 abandoned by Hashar:
change compact style module definition to nested (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176275 abandoned by Hashar:
add basic documentation comments (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176276 abandoned by Hashar:
add empty lines (per rubocop style)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176277 abandoned by Hashar:
remove extra blank lines (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176279 abandoned by Hashar:
use guard clause per rubocop
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176282 abandoned by Hashar:
disable cop in this instance as rvm requires no space
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176340 abandoned by Hashar:
remove redundant selfs (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176342 abandoned by Hashar:
use english special globals per rubocop
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176344 abandoned by Hashar:
disable global cop around globals that can't easily be removed
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 179461 abandoned by Hashar:
remove comma after last item of hash (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 179462 abandoned by Hashar:
fullstop with method name (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 179463 abandoned by Hashar:
remove space inside empty braces (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 179464 abandoned by Hashar:
use &: style instead of block (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176252 abandoned by Hashar:
fix rubocop string literal offenses
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176253 abandoned by Hashar:
mark unused argument (rubocop fix)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176254 abandoned by Hashar:
remove non applicable private (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176255 abandoned by Hashar:
rubocop line length fixes
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176256 abandoned by Hashar:
add MediaWiki standard rubocop config
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(
Change 176260 abandoned by Hashar:
change block comments to # comments (per rubocop)
Reason:
This is in conflict since the env-abstraction-layer branch got merged.
Unfortunately, needs to be redone :-(