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

Update recent model and migration files #1975

Merged
merged 3 commits into from
Apr 25, 2019
Merged

Conversation

javierm
Copy link

@javierm javierm commented Apr 23, 2019

References

Objectives

Upgrade migration and model files in order to follow Rails 5 inheritance conventions. These migrations and models were created shortly before updating to Rails 5, and so the migrations didn't have the version number and the models inherited from ActiveRecord::Base instead of ApplicationRecord.

Does this PR need a Backport to CONSUL?

Yes, backport when backporting the pull requests which generated these migrations. The part related to image_attributes is already backported in consul#3520, and the part related to stats migrations is already backported in consul#3512.

@javierm javierm self-assigned this Apr 23, 2019
@javierm javierm mentioned this pull request Apr 23, 2019
@javierm javierm changed the title Update recently merged migration files Update recently merged model and migration files Apr 24, 2019
@javierm javierm changed the title Update recently merged model and migration files Update recent model and migration files Apr 24, 2019
These migrations were created shortly before updating to Rails 5, and so
they didn't have the version number.
This model was added after the Rails 5 branch was created but before it
was merged.
It was accidentally added again when solving conflicts between `master`
and the branches for Rails 5 and translations.
@javierm
Copy link
Author

javierm commented Apr 25, 2019

Travis build failed due to issue consul#3451, which is not related to this pull request.

@javierm javierm merged commit dfcc352 into master Apr 25, 2019
@javierm javierm deleted the update_recent_migrations branch April 25, 2019 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants