diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-17 16:59:50 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-24 15:07:24 +0100 |
| commit | ad6d6232342558705c54ba70a94f9d7ddbd00f8c (patch) | |
| tree | 2114eb91b0ddf6273909c364c1786747cd3d4827 /app/models | |
| parent | 7561b1c2a486ae57e9fbebadadbe1269bfdba6a0 (diff) | |
| download | gitlab-ce-ad6d6232342558705c54ba70a94f9d7ddbd00f8c.tar.gz | |
Add Bitbucket importer.
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 91ab788083d..d858f7f2937 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -130,7 +130,7 @@ class Project < ActiveRecord::Base validates_uniqueness_of :name, scope: :namespace_id validates_uniqueness_of :path, scope: :namespace_id validates :import_url, - format: { with: URI::regexp(%w(git http https)), message: 'should be a valid url' }, + format: { with: URI::regexp(%w(ssh git http https)), message: 'should be a valid url' }, if: :import? validates :star_count, numericality: { greater_than_or_equal_to: 0 } validate :check_limit, on: :create diff --git a/app/models/user.rb b/app/models/user.rb index 08ad619a90c..b381ee27120 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' |