Development: undefined method 'trust_level_locked' did you mean trust_level?

On my dev instance I just did an import and now when I access a topic I’m getting this error.

undefined method `trust_level_locked' for #<User:0x0055d8685b81c8>
Did you mean?  trust_level

sometimes just in the logs and sometimes it pulls up the Rails error console (or whatever it’s called).

It looks like some mismatch between versions. I’ve done a db:migrate and bundle install, but I’m still getting the error.

I guess I’ll back up to a new database and see what happens from there, or maybe there’s something “obvious” that I’m missing.

Edit: I did a git pull upstream master, bundle install, and migrated and I’m back in business.