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

Fix database.yml indentation #1252

Merged
merged 1 commit into from
Dec 16, 2021
Merged

Fix database.yml indentation #1252

merged 1 commit into from
Dec 16, 2021

Conversation

schneems
Copy link
Contributor

Close #1250

In https://github.com/heroku/heroku-buildpack-ruby/pull/1229/files#diff-d7f6f21bc5e80a7032506dae28ef835682a02ae9d2d9d162faccf793a826f1bcR944-R950 a helper method with a block was removed. All code within the block was indented. When the block was removed the indentation was incorrectly collapsed for the config/database.yml heredoc.

Prior to Rails 4.1 Heroku would over-write any database.yml to read from DATABASE_URL https://devcenter.heroku.com/changelog-items/709.

This is running tests, and adding a changelog for #1251

@schneems schneems requested a review from a team as a code owner December 16, 2021 20:16
Close #1250

In https://github.com/heroku/heroku-buildpack-ruby/pull/1229/files#diff-d7f6f21bc5e80a7032506dae28ef835682a02ae9d2d9d162faccf793a826f1bcR944-R950 a helper method with a block was removed. All code within the block was indented. When the block was removed the indentation was incorrectly collapsed for the `config/database.yml` heredoc.

Prior to Rails 4.1 Heroku would over-write any database.yml to read from DATABASE_URL https://devcenter.heroku.com/changelog-items/709.

This is running tests, and adding a changelog for #1251
Copy link
Member

@edmorley edmorley left a comment

Choose a reason for hiding this comment

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

Could you file a ticket for adding a test in the future? (Not worth blocking this fix for now)

@schneems
Copy link
Contributor Author

schneems commented Dec 16, 2021

Already made an issue #1253

@schneems schneems enabled auto-merge (squash) December 16, 2021 20:21
@schneems
Copy link
Contributor Author

Flappy test, restarting

$ rspec ./spec/hatchet/bundler_spec.rb:44
Run options: include {:focused=>true, :locations=>{"./spec/hatchet/bundler_spec.rb"=>[44]}}
Hatchet setup: "hatchet-t-ab7e012649" for "default_ruby"
Running which -a rake on hatchet-t-ab7e012649...
Running which -a rake on hatchet-t-ab7e012649... up, run.7530 (Standard-1X)
.

Finished in 22.66 seconds (files took 0.72218 seconds to load)
1 example, 0 failures

@schneems schneems merged commit cdc7902 into main Dec 16, 2021
@schneems schneems deleted the fix-yml-indentation branch December 16, 2021 20:53
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.

formatting of database.yml changed in the last release!
3 participants