diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-02 08:39:52 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-02 08:39:52 -0600 |
| commit | 4c1fd9a19c779fa6e7d74513c61f37ce05a841b3 (patch) | |
| tree | 0cf23810e2f7ff0f45c65a3f2f9b35016587c68a /db/migrate/20180109143959_add_remember_token_to_users.rb | |
| parent | ad3a2dfb66abc01a90807f23191b7e28c3c242ed (diff) | |
| parent | 33f56811e38bc330de9dcfa6794c29a176a30311 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'db/migrate/20180109143959_add_remember_token_to_users.rb')
| -rw-r--r-- | db/migrate/20180109143959_add_remember_token_to_users.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/db/migrate/20180109143959_add_remember_token_to_users.rb b/db/migrate/20180109143959_add_remember_token_to_users.rb new file mode 100644 index 000000000..662905bcb --- /dev/null +++ b/db/migrate/20180109143959_add_remember_token_to_users.rb @@ -0,0 +1,5 @@ +class AddRememberTokenToUsers < ActiveRecord::Migration[5.1] + def change + add_column :users, :remember_token, :string, null: true + end +end |