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.

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

Only concat help_text if it exists #524

Merged
merged 4 commits into from
Mar 8, 2019

Conversation

simmerz
Copy link
Contributor

@simmerz simmerz commented Feb 26, 2019

@lcreid I found a bug in my own code. This little fix allows help_text to be nil, and still work :|

@bootstrap-ruby-bot
Copy link

bootstrap-ruby-bot commented Feb 26, 2019

1 Warning
⚠️ There are code changes, but no corresponding tests. Please include tests if this PR introduces any modifications in bootstrap_form’s behavior.

Generated by 🚫 Danger

Copy link
Contributor

@lcreid lcreid left a comment

Choose a reason for hiding this comment

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

Good catch! Thanks for this!

Dangerfile Outdated
@@ -29,7 +29,7 @@ end
# Have you updated CHANGELOG.md?
# ------------------------------------------------------------------------------
if !has_changelog_changes && has_lib_changes
markdown <<-MARKDOWN.strip_heredoc
markdown <<~MARKDOWN
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this change breaks the Travis build because we still have to support Ruby 2.2. Could you please put this file back the way it was, if that's indeed the problem? Thanks in advance.

Sorry for the double review. I hit approve before I saw that Travis was failing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No worries. I noticed that the original with strip_heredoc was failing too on one of the builds. Perhaps just drop the strip_heredoc command?

Copy link
Contributor

Choose a reason for hiding this comment

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

I haven't run into a strip_heredoc failing before. Do you recall what version or what test failed with the <-MARKDOWN.strip_heredoc version? In the meantime, could you try reverting this one change from the PR so it passes Travis and I can merge it? With Rails 6 coming out soon, we'll be reviewing all the versions of Ruby and Rails that we support, and we can clean up some of the old Ruby syntax at that time, if it causes a problem.

In my testing, the Dangerfile passes RubyCop with the original syntax, because RuboCop is configured to use Ruby 2.2 syntax. The Dangerfile itself runs fine with the new syntax, because .travis.yml says run Danger with Ruby 2.5.

Copy link
Contributor

Choose a reason for hiding this comment

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

@simmerz would you mind fixing this PR so it passes Travis? I'd like to do a minor release of the gem, but we should get this fix in before we release it. Thanks in advance.

@lcreid lcreid merged commit b19de8c into bootstrap-ruby:master Mar 8, 2019
@lcreid
Copy link
Contributor

lcreid commented Mar 8, 2019

Thanks!

dunn added a commit to dunn/bootstrap_form that referenced this pull request Jan 23, 2020
Followup to bootstrap-ruby#524, on the other branch of the conditional.
dunn added a commit to dunn/bootstrap_form that referenced this pull request Jan 23, 2020
Followup to bootstrap-ruby#524, on the other branch of the conditional.
dunn added a commit to dunn/bootstrap_form that referenced this pull request Jan 23, 2020
Followup to bootstrap-ruby#524, on the other branch of the conditional.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants