Support another file type .rake in rake notes

[bjnord]

Similar to commit 55ceced which added support for .css .scss and .js, this commit adds .rake files to the list of files scanned by the rake notes and rake notes:custom tasks. These tasks will now pick up FIXME and TODO in lib/tasks/*.rake custom rake tasks.

[rafaelfranca]

Could you add a CHANGELOG entry?

[vijaydev]

"Only" sounds odd when nearly a dozen extensions are supported !

[bjnord]

I was going for minimal change (only adding the new extension). I'm happy to commit a change to remove the word "Only" here and line 59 if you'd like.

[vijaydev]

Yeah got that. Please go ahead and make the fix. Thanks :)

[steveklabnik]

This will need rebased, and while you're at it, should get squashed.

[bjnord]

The squashed commit 28b32df has all my changes. Hope I did the rebasing right (first time); if not, please let me know what I need to do differently. Thanks.

[steveklabnik]

So, https://github.com/rails/rails/pull/7871/commits shows seven commits. Ideally, it should show just 28b32df. That said, it should be easy enough for @rafaelfranca or whoever merges to just cherry-pick that.

Normally, you'd do something like this. I'm assuming upstream is pointing at rails/rails.git:

$ git fetch upstream
$ git checkout master
$ git rebase upstream/master
$ git rebase -i

< choose squash for all of your commits>

$ git push origin master -f

Note that it's often good to make patches against a new branch, and not your master; this only matters if you submit two pulls at once, which can happen since pulls sit for a month or two at times. :)

[steveklabnik]

(fwiw, it looks like you squashed fine, except the CHANGELOG entry isn't in 28b32df. Looks like the rebase didn't quite work out)

[bjnord]

Steve: Thanks so much for the detailed explanation. You're right, I should have used a branch; will do that next time. I would have known how to squash a branch and move it forward as needed.

[See comment below; commit 06129c0 has them all now.]

[steveklabnik]

Sorry! I messed up. Don't squash your first commit. the rest squash into it, make sense?

[bjnord]

Finally I think I might have it: The commit 06129c0 has all the changes in a single commit, including the CHANGELOG.

[steveklabnik]

:D looks like it...

[rafaelfranca]

Thank you guys