diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 20:21:45 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 20:21:45 +0300 |
| commit | a52529f9b6258b2ae2793930096c3fcbe40078f3 (patch) | |
| tree | fc28baed1a41a50892215c94ccee3f2eddf9772c /app/models/user.rb | |
| parent | 7475f4f00d999a603eb01a0b70a966db1cd243d8 (diff) | |
| parent | 56f51bed6b166f12b8b0f4f1bd883142c5e079a6 (diff) | |
Merge branch 'bitbucket-import'
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index a43493d15fb..a4850982899 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -46,6 +46,7 @@ # github_access_token :string(255) # notification_email :string(255) # password_automatically_set :boolean default(FALSE) +# bitbucket_access_token :string(255) # require 'carrierwave/orm/activerecord' |