Rubocop: Site Drop #4948

Merged
merged 1 commit into from May 26, 2016

Conversation

Projects
None yet
4 participants
@pathawks
Member

pathawks commented May 25, 2016

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks May 25, 2016

Contributor

Travis doesn't like this pull but it's wrong, nothing changed here other than style. :shipit:

Contributor

envygeeks commented May 25, 2016

Travis doesn't like this pull but it's wrong, nothing changed here other than style. :shipit:

@envygeeks envygeeks added the shipit label May 25, 2016

.rubocop.yml
@@ -14,8 +14,6 @@ AllCops:
- lib/jekyll/convertible.rb
- lib/jekyll/deprecator.rb
- lib/jekyll/document.rb
- - lib/jekyll/drops/site_drop.rb
- - lib/jekyll/entry_filter.rb

This comment has been minimized.

@parkr

parkr May 25, 2016

Member

Remove this – entry_filter is where most of the problems are. 😄

@parkr

parkr May 25, 2016

Member

Remove this – entry_filter is where most of the problems are. 😄

@parkr parkr added pending-rebase and removed shipit labels May 25, 2016

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr May 25, 2016

Member

@pathawks You'll also need to rebase to make that drop rubocop issue go away 😄

Member

parkr commented May 25, 2016

@pathawks You'll also need to rebase to make that drop rubocop issue go away 😄

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks May 26, 2016

Member

Remove this – entry_filter is where most of the problems are.

DOH! :feelsgood:👍

Member

pathawks commented May 26, 2016

Remove this – entry_filter is where most of the problems are.

DOH! :feelsgood:👍

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks May 26, 2016

Member

Does @jekyllbot notice when a PR has been rebased? That'd be cool

Member

pathawks commented May 26, 2016

Does @jekyllbot notice when a PR has been rebased? That'd be cool

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr May 26, 2016

Member

Does @jekyllbot notice when a PR has been rebased? That'd be cool

Not at the moment. The bot gets a PullRequestEvent with action = synchronize. I took a look yesterday but so far didn't see anything about a force push vs a different kind of push. It's not a PushEvent because you're pushing to a different repo technically. I'll ask about this.

Member

parkr commented May 26, 2016

Does @jekyllbot notice when a PR has been rebased? That'd be cool

Not at the moment. The bot gets a PullRequestEvent with action = synchronize. I took a look yesterday but so far didn't see anything about a force push vs a different kind of push. It's not a PushEvent because you're pushing to a different repo technically. I'll ask about this.

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks May 26, 2016

Member

Well, it has been rebased, whether or not @jekyllbot is willing to admit it 😜

Member

pathawks commented May 26, 2016

Well, it has been rebased, whether or not @jekyllbot is willing to admit it 😜

@parkr parkr removed the pending-rebase label May 26, 2016

@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks May 26, 2016

Contributor

@parkr it should be able to double back onto the status API and see whether or not it conflicted.

Contributor

envygeeks commented May 26, 2016

@parkr it should be able to double back onto the status API and see whether or not it conflicted.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr May 26, 2016

Member

@jekyllbot: merge +dev

Member

parkr commented May 26, 2016

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 8a5148f into jekyll:master May 26, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

jekyllbot added a commit that referenced this pull request May 26, 2016

@pathawks pathawks deleted the pathawks:drops branch May 27, 2016

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