diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-06 15:24:35 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-06 15:24:35 +0000 |
| commit | dd890d7ef3a1e5c77184b063558fb85b40e2da85 (patch) | |
| tree | 7320bff5a00c71c68238e85b233e16eb584c1c03 | |
| parent | 70b065aa4417d523e0fa044b71a99450a4e09e59 (diff) | |
| parent | 2dcd3f29ddf6d54468f3e712166d9504aa356f6f (diff) | |
| download | gitlab-ce-dd890d7ef3a1e5c77184b063558fb85b40e2da85.tar.gz | |
Merge branch 'annotate-models' into 'master'
Annotate models
See merge request !4071
| -rw-r--r-- | app/models/hooks/project_hook.rb | 1 | ||||
| -rw-r--r-- | app/models/hooks/service_hook.rb | 1 | ||||
| -rw-r--r-- | app/models/hooks/system_hook.rb | 1 | ||||
| -rw-r--r-- | app/models/hooks/web_hook.rb | 1 | ||||
| -rw-r--r-- | app/models/project_import_data.rb | 4 |
5 files changed, 6 insertions, 2 deletions
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb index 64f570b12ae..2b8f34a0568 100644 --- a/app/models/hooks/project_hook.rb +++ b/app/models/hooks/project_hook.rb @@ -17,6 +17,7 @@ # enable_ssl_verification :boolean default(TRUE) # build_events :boolean default(FALSE), not null # wiki_page_events :boolean default(FALSE), not null +# token :string # class ProjectHook < WebHook diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb index 23f6468ee52..0e176de5ef8 100644 --- a/app/models/hooks/service_hook.rb +++ b/app/models/hooks/service_hook.rb @@ -17,6 +17,7 @@ # enable_ssl_verification :boolean default(TRUE) # build_events :boolean default(FALSE), not null # wiki_page_events :boolean default(FALSE), not null +# token :string # class ServiceHook < WebHook diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb index 5e9046f3623..ad508cbbcb8 100644 --- a/app/models/hooks/system_hook.rb +++ b/app/models/hooks/system_hook.rb @@ -17,6 +17,7 @@ # enable_ssl_verification :boolean default(TRUE) # build_events :boolean default(FALSE), not null # wiki_page_events :boolean default(FALSE), not null +# token :string # class SystemHook < WebHook diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index a8f17ac16a6..8e58c9583ab 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -17,6 +17,7 @@ # enable_ssl_verification :boolean default(TRUE) # build_events :boolean default(FALSE), not null # wiki_page_events :boolean default(FALSE), not null +# token :string # class WebHook < ActiveRecord::Base diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb index 3f0080205dd..7830f764ed3 100644 --- a/app/models/project_import_data.rb +++ b/app/models/project_import_data.rb @@ -6,8 +6,8 @@ # project_id :integer # data :text # encrypted_credentials :text -# encrypted_credentials_iv :text -# encrypted_credentials_salt :text +# encrypted_credentials_iv :string +# encrypted_credentials_salt :string # require 'carrierwave/orm/activerecord' |