Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix indentation manually #32686

Merged
merged 1 commit into from
Apr 22, 2018
Merged

Fix indentation manually #32686

merged 1 commit into from
Apr 22, 2018

Conversation

yhirano55
Copy link
Contributor

@yhirano55 yhirano55 commented Apr 22, 2018 •
edited

Summary

Rubocop auto-correct doesn't work well, so I fixed indentation manually.

Offenses:

railties/test/generators/app_generator_test.rb:825:5: C: [Corrected] Layout/IndentationWidth: Use 2 (not 3) spaces for indentation.
       assert_file "Gemfile" do |content|
    ^^^
railties/test/generators/app_generator_test.rb:828:7: C: [Corrected] Layout/IndentationConsistency: Inconsistent indentation detected.
      assert_file "config/boot.rb" do |content| ...
      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
railties/test/generators/app_generator_test.rb:828:8: C: [Corrected] Layout/IndentationConsistency: Inconsistent indentation detected.
       assert_file "config/boot.rb" do |content| ...
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@rails-bot
Copy link

r? @kamipo

(@rails-bot has picked a reviewer for you, use r? to override)

kamipo
kamipo reviewed Apr 22, 2018
View reviewed changes
railties/test/generators/app_generator_test.rb Outdated
end
assert_file "Gemfile" do |content|
assert_no_match(/bootsnap/, content)
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

end alignment has broken by auto-correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, thanks. I'll fix soon…

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've fixed it.

kamipo
kamipo reviewed Apr 22, 2018
View reviewed changes
railties/test/generators/app_generator_test.rb Outdated
assert_no_match(/bootsnap/, content)
end
assert_file "Gemfile" do |content|
assert_no_match(/bootsnap/, content)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto.

@yhirano55
Fix indentation manually
d8fca79 
Rubocop auto-correct doesn't work well, so I fixed indentation manually.
@yhirano55 yhirano55 force-pushed the fix-indentation-with-rubocop branch from b315f96 to d8fca79 Compare April 22, 2018 09:22
@yhirano55 yhirano55 changed the title Fix indentation with rubocop auto-correct Fix indentation manually Apr 22, 2018
@kamipo kamipo merged commit 44b4aaf into rails:master Apr 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kamipo kamipo kamipo left review comments

Assignees

@kamipo kamipo

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@yhirano55 @rails-bot @kamipo