diff options
| author | Marco Wessel <marco@poop.nl> | 2015-01-30 02:16:24 +0300 |
|---|---|---|
| committer | Marco Wessel <marco@poop.nl> | 2015-01-30 02:16:24 +0300 |
| commit | 20e269cb925cfad58cce0b19e17aa15075c4481e (patch) | |
| tree | d53e52bcc3881ca25f67b6cdeb473bf3d6290369 /db/migrate | |
| parent | 2a4502111e03c233861b545ae3ff3afd95614c4a (diff) | |
| parent | 604f39274dc1558f8710019e226b1a364f056d7e (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection
Conflicts:
CHANGELOG
db/schema.rb
Diffstat (limited to 'db/migrate')
| -rw-r--r-- | db/migrate/20150116234545_add_gitlab_access_token_to_user.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb b/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb new file mode 100644 index 00000000000..c28ba3197ac --- /dev/null +++ b/db/migrate/20150116234545_add_gitlab_access_token_to_user.rb @@ -0,0 +1,5 @@ +class AddGitlabAccessTokenToUser < ActiveRecord::Migration + def change + add_column :users, :gitlab_access_token, :string + end +end |