diff options
68 files changed, 286 insertions, 228 deletions
diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb index bebe0da9c61..85ab7ed6ae8 100644 --- a/app/models/broadcast_message.rb +++ b/app/models/broadcast_message.rb @@ -3,12 +3,12 @@ # Table name: broadcast_messages # # id :integer not null, primary key -# message :text default(""), not null +# message :text not null # starts_at :datetime # ends_at :datetime # alert_type :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # color :string(255) # font :string(255) # diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb index 47aeb93a419..570f5e91c13 100644 --- a/app/models/deploy_key.rb +++ b/app/models/deploy_key.rb @@ -4,8 +4,8 @@ # # id :integer not null, primary key # user_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # key :text # title :string(255) # type :string(255) diff --git a/app/models/deploy_keys_project.rb b/app/models/deploy_keys_project.rb index 6f109e48314..739d749830a 100644 --- a/app/models/deploy_keys_project.rb +++ b/app/models/deploy_keys_project.rb @@ -5,8 +5,8 @@ # id :integer not null, primary key # deploy_key_id :integer not null # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # class DeployKeysProject < ActiveRecord::Base diff --git a/app/models/email.rb b/app/models/email.rb index b92c1841063..9068c2b87b6 100644 --- a/app/models/email.rb +++ b/app/models/email.rb @@ -2,10 +2,13 @@ # # Table name: emails # -# id :integer not null, primary key -# user_id :integer not null -# email :string not null -# created_at :datetime not null +# id :integer not null, primary key +# user_id :integer not null +# email :string(255) not null +# created_at :datetime +# updated_at :datetime +# + class Email < ActiveRecord::Base attr_accessible :email, :user_id diff --git a/app/models/event.rb b/app/models/event.rb index 5c156856d79..cf88e9f4afc 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -8,8 +8,8 @@ # title :string(255) # data :text # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # action :integer # author_id :integer # diff --git a/app/models/forked_project_link.rb b/app/models/forked_project_link.rb index aaa527a1145..17add270f67 100644 --- a/app/models/forked_project_link.rb +++ b/app/models/forked_project_link.rb @@ -5,8 +5,8 @@ # id :integer not null, primary key # forked_to_project_id :integer not null # forked_from_project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # class ForkedProjectLink < ActiveRecord::Base diff --git a/app/models/group.rb b/app/models/group.rb index 0d4d5f4e836..3cbf30a20df 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -6,10 +6,11 @@ # name :string(255) not null # path :string(255) not null # owner_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) # description :string(255) default(""), not null +# avatar :string(255) # require 'carrierwave/orm/activerecord' diff --git a/app/models/issue.rb b/app/models/issue.rb index 21040327741..16d51345e5a 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -7,8 +7,8 @@ # assignee_id :integer # author_id :integer # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # position :integer default(0) # branch_name :string(255) # description :text diff --git a/app/models/key.rb b/app/models/key.rb index 4202d79a956..035c9efa016 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -4,8 +4,8 @@ # # id :integer not null, primary key # user_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # key :text # title :string(255) # type :string(255) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 1ec76dbd39a..8c885b70a48 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -9,10 +9,8 @@ # author_id :integer # assignee_id :integer # title :string(255) -# created_at :datetime not null -# updated_at :datetime not null -# st_commits :text(2147483647) -# st_diffs :text(2147483647) +# created_at :datetime +# updated_at :datetime # milestone_id :integer # state :string(255) # merge_status :string(255) diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 99afffc1db0..0684461add7 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -1,3 +1,16 @@ +# == Schema Information +# +# Table name: merge_request_diffs +# +# id :integer not null, primary key +# state :string(255) default("collected"), not null +# st_commits :text +# st_diffs :text +# merge_request_id :integer not null +# created_at :datetime +# updated_at :datetime +# + require Rails.root.join("app/models/commit") class MergeRequestDiff < ActiveRecord::Base diff --git a/app/models/milestone.rb b/app/models/milestone.rb index e16529a634c..6a2ca767030 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -7,8 +7,8 @@ # project_id :integer not null # description :text # due_date :date -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # state :string(255) # iid :integer # diff --git a/app/models/namespace.rb b/app/models/namespace.rb index 468c93bd426..7973eef7e1c 100644 --- a/app/models/namespace.rb +++ b/app/models/namespace.rb @@ -6,8 +6,8 @@ # name :string(255) not null # path :string(255) not null # owner_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) # description :string(255) default(""), not null # avatar :string(255) diff --git a/app/models/note.rb b/app/models/note.rb index d666d5d52c8..6f7afcd1f9f 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -6,15 +6,15 @@ # note :text # noteable_type :string(255) # author_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # project_id :integer # attachment :string(255) # line_code :string(255) # commit_id :string(255) # noteable_id :integer -# st_diff :text # system :boolean default(FALSE), not null +# st_diff :text # require 'carrierwave/orm/activerecord' diff --git a/app/models/personal_snippet.rb b/app/models/personal_snippet.rb index ef2000ad05e..a3c0d201ee5 100644 --- a/app/models/personal_snippet.rb +++ b/app/models/personal_snippet.rb @@ -4,11 +4,11 @@ # # id :integer not null, primary key # title :string(255) -# content :text(2147483647) +# content :text # author_id :integer not null # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # file_name :string(255) # expires_at :datetime # private :boolean default(TRUE), not null diff --git a/app/models/project.rb b/app/models/project.rb index 09642ffa22f..e2e1ea88d46 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -6,8 +6,8 @@ # name :string(255) # path :string(255) # description :text -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # creator_id :integer # issues_enabled :boolean default(TRUE), not null # wall_enabled :boolean default(TRUE), not null @@ -18,9 +18,10 @@ # issues_tracker_id :string(255) # snippets_enabled :boolean default(TRUE), not null # last_activity_at :datetime -# imported :boolean default(FALSE), not null # import_url :string(255) # visibility_level :integer default(0), not null +# archived :boolean default(FALSE), not null +# import_status :string(255) # class Project < ActiveRecord::Base diff --git a/app/models/project_hook.rb b/app/models/project_hook.rb index 4e9b22532cb..6db6767a88d 100644 --- a/app/models/project_hook.rb +++ b/app/models/project_hook.rb @@ -5,13 +5,14 @@ # id :integer not null, primary key # url :string(255) # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null # merge_requests_events :boolean default(FALSE), not null +# tag_push_events :boolean default(FALSE) # class ProjectHook < WebHook diff --git a/app/models/project_services/assembla_service.rb b/app/models/project_services/assembla_service.rb index 2a2c5172916..06e9d6118d2 100644 --- a/app/models/project_services/assembla_service.rb +++ b/app/models/project_services/assembla_service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/project_services/campfire_service.rb b/app/models/project_services/campfire_service.rb index f9247e054c7..19030ecffa2 100644 --- a/app/models/project_services/campfire_service.rb +++ b/app/models/project_services/campfire_service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb index 0a453166342..04775c4f2b2 100644 --- a/app/models/project_services/emails_on_push_service.rb +++ b/app/models/project_services/emails_on_push_service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb index 2603a1f67a4..6cdd04a8648 100644 --- a/app/models/project_services/flowdock_service.rb +++ b/app/models/project_services/flowdock_service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/project_services/gemnasium_service.rb b/app/models/project_services/gemnasium_service.rb index 0b8e7bad353..b363d7f57d2 100644 --- a/app/models/project_services/gemnasium_service.rb +++ b/app/models/project_services/gemnasium_service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb index 81ac47c913d..ed1944f3373 100644 --- a/app/models/project_services/gitlab_ci_service.rb +++ b/app/models/project_services/gitlab_ci_service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index 3cee047a32a..d62f61856d1 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/project_services/pivotaltracker_service.rb b/app/models/project_services/pivotaltracker_service.rb index 877b9a77404..aa2bcc5def7 100644 --- a/app/models/project_services/pivotaltracker_service.rb +++ b/app/models/project_services/pivotaltracker_service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb index a3697b31352..50fd62def1d 100644 --- a/app/models/project_services/slack_service.rb +++ b/app/models/project_services/slack_service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/project_snippet.rb b/app/models/project_snippet.rb index f38aa07059c..14c88046423 100644 --- a/app/models/project_snippet.rb +++ b/app/models/project_snippet.rb @@ -4,11 +4,11 @@ # # id :integer not null, primary key # title :string(255) -# content :text(2147483647) +# content :text # author_id :integer not null # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # file_name :string(255) # expires_at :datetime # private :boolean default(TRUE), not null diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb index 16379720e59..d2b2b1218d1 100644 --- a/app/models/protected_branch.rb +++ b/app/models/protected_branch.rb @@ -5,8 +5,8 @@ # id :integer not null, primary key # project_id :integer not null # name :string(255) not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # class ProtectedBranch < ActiveRecord::Base diff --git a/app/models/service.rb b/app/models/service.rb index f7e440dcc81..ea000395218 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/app/models/service_hook.rb b/app/models/service_hook.rb index 6f22a863d98..2e11239c40b 100644 --- a/app/models/service_hook.rb +++ b/app/models/service_hook.rb @@ -5,13 +5,14 @@ # id :integer not null, primary key # url :string(255) # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null # merge_requests_events :boolean default(FALSE), not null +# tag_push_events :boolean default(FALSE) # class ServiceHook < WebHook diff --git a/app/models/snippet.rb b/app/models/snippet.rb index c1c9ba257f2..720accd73dc 100644 --- a/app/models/snippet.rb +++ b/app/models/snippet.rb @@ -4,11 +4,11 @@ # # id :integer not null, primary key # title :string(255) -# content :text(2147483647) +# content :text # author_id :integer not null # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # file_name :string(255) # expires_at :datetime # private :boolean default(TRUE), not null diff --git a/app/models/system_hook.rb b/app/models/system_hook.rb index bffcbbf00f4..ee32b49bc66 100644 --- a/app/models/system_hook.rb +++ b/app/models/system_hook.rb @@ -5,13 +5,14 @@ # id :integer not null, primary key # url :string(255) # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null # merge_requests_events :boolean default(FALSE), not null +# tag_push_events :boolean default(FALSE) # class SystemHook < WebHook diff --git a/app/models/user.rb b/app/models/user.rb index c25dcb074a1..16961e5413b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,47 +2,48 @@ # # Table name: users # -# id :integer not null, primary key -# email :string(255) default(""), not null -# encrypted_password :string(255) default(""), not null -# reset_password_token :string(255) -# reset_password_sent_at :datetime -# remember_created_at :datetime -# sign_in_count :integer default(0) -# current_sign_in_at :datetime -# last_sign_in_at :datetime -# current_sign_in_ip :string(255) -# last_sign_in_ip :string(255) -# created_at :datetime not null -# updated_at :datetime not null -# name :string(255) -# admin :boolean default(FALSE), not null -# projects_limit :integer default(10) -# skype :string(255) default(""), not null -# linkedin :string(255) default(""), not null -# twitter :string(255) default(""), not null -# authentication_token :string(255) -# theme_id :integer default(1), not null -# bio :string(255) -# failed_attempts :integer default(0) -# locked_at :datetime -# extern_uid :string(255) -# provider :string(255) -# username :string(255) -# can_create_group :boolean default(TRUE), not null -# can_create_team :boolean default(TRUE), not null -# state :string(255) -# color_scheme_id :integer default(1), not null -# notification_level :integer default(1), not null -# password_expires_at :datetime -# created_by_id :integer -# avatar :string(255) -# confirmation_token :string(255) -# confirmed_at :datetime -# confirmation_sent_at :datetime -# unconfirmed_email :string(255) -# hide_no_ssh_key :boolean default(FALSE) -# website_url :string(255) default(""), not null +# id :integer not null, primary key +# email :string(255) default(""), not null +# encrypted_password :string(255) default(""), not null +# reset_password_token :string(255) +# reset_password_sent_at :datetime +# remember_created_at :datetime +# sign_in_count :integer default(0) +# current_sign_in_at :datetime +# last_sign_in_at :datetime +# current_sign_in_ip :string(255) +# last_sign_in_ip :string(255) +# created_at :datetime +# updated_at :datetime +# name :string(255) +# admin :boolean default(FALSE), not null +# projects_limit :integer default(10) +# skype :string(255) default(""), not null +# linkedin :string(255) default(""), not null +# twitter :string(255) default(""), not null +# authentication_token :string(255) +# theme_id :integer default(1), not null +# bio :string(255) +# failed_attempts :integer default(0) +# locked_at :datetime +# extern_uid :string(255) +# provider :string(255) +# username :string(255) +# can_create_group :boolean default(TRUE), not null +# can_create_team :boolean default(TRUE), not null +# state :string(255) +# color_scheme_id :integer default(1), not null +# notification_level :integer default(1), not null +# password_expires_at :datetime +# created_by_id :integer +# last_credential_check_at :datetime +# avatar :string(255) +# confirmation_token :string(255) +# confirmed_at :datetime +# confirmation_sent_at :datetime +# unconfirmed_email :string(255) +# hide_no_ssh_key :boolean default(FALSE) +# website_url :string(255) default(""), not null # require 'carrierwave/orm/activerecord' diff --git a/app/models/users_group.rb b/app/models/users_group.rb index 181bf322283..5f8b832d51e 100644 --- a/app/models/users_group.rb +++ b/app/models/users_group.rb @@ -6,8 +6,8 @@ # group_access :integer not null # group_id :integer not null # user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # notification_level :integer default(3), not null # diff --git a/app/models/users_project.rb b/app/models/users_project.rb index 6f147859a5c..e8810f56def 100644 --- a/app/models/users_project.rb +++ b/app/models/users_project.rb @@ -5,8 +5,8 @@ # id :integer not null, primary key # user_id :integer not null # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # project_access :integer default(0), not null # notification_level :integer default(3), not null # diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb index 45a795391a2..76854da5c38 100644 --- a/app/models/web_hook.rb +++ b/app/models/web_hook.rb @@ -5,13 +5,14 @@ # id :integer not null, primary key # url :string(255) # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null # merge_requests_events :boolean default(FALSE), not null +# tag_push_events :boolean default(FALSE) # class WebHook < ActiveRecord::Base diff --git a/spec/factories/broadcast_messages.rb b/spec/factories/broadcast_messages.rb index 6339d5c4003..ea0039d39e6 100644 --- a/spec/factories/broadcast_messages.rb +++ b/spec/factories/broadcast_messages.rb @@ -3,12 +3,12 @@ # Table name: broadcast_messages # # id :integer not null, primary key -# message :text default(""), not null +# message :text not null # starts_at :datetime # ends_at :datetime # alert_type :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # color :string(255) # font :string(255) # diff --git a/spec/factories/forked_project_links.rb b/spec/factories/forked_project_links.rb index 2f9b91acf2c..906e4106b32 100644 --- a/spec/factories/forked_project_links.rb +++ b/spec/factories/forked_project_links.rb @@ -5,8 +5,8 @@ # id :integer not null, primary key # forked_to_project_id :integer not null # forked_from_project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # # Read about factories at https://github.com/thoughtbot/factory_girl diff --git a/spec/factories/users_groups.rb b/spec/factories/users_groups.rb index 34bc0c51468..49c3a367e16 100644 --- a/spec/factories/users_groups.rb +++ b/spec/factories/users_groups.rb @@ -6,8 +6,8 @@ # group_access :integer not null # group_id :integer not null # user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # notification_level :integer default(3), not null # diff --git a/spec/models/assembla_service_spec.rb b/spec/models/assembla_service_spec.rb index 1730a64283a..8b964bccc0b 100644 --- a/spec/models/assembla_service_spec.rb +++ b/spec/models/assembla_service_spec.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/spec/models/broadcast_message_spec.rb b/spec/models/broadcast_message_spec.rb index cf0b36a2830..0f31c407c90 100644 --- a/spec/models/broadcast_message_spec.rb +++ b/spec/models/broadcast_message_spec.rb @@ -3,12 +3,12 @@ # Table name: broadcast_messages # # id :integer not null, primary key -# message :text default(""), not null +# message :text not null # starts_at :datetime # ends_at :datetime # alert_type :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # color :string(255) # font :string(255) # diff --git a/spec/models/deploy_key_spec.rb b/spec/models/deploy_key_spec.rb index b76ca660411..adbbbac875f 100644 --- a/spec/models/deploy_key_spec.rb +++ b/spec/models/deploy_key_spec.rb @@ -4,8 +4,8 @@ # # id :integer not null, primary key # user_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # key :text # title :string(255) # type :string(255) diff --git a/spec/models/deploy_keys_project_spec.rb b/spec/models/deploy_keys_project_spec.rb index aeec1713558..3e0e25ee39a 100644 --- a/spec/models/deploy_keys_project_spec.rb +++ b/spec/models/deploy_keys_project_spec.rb @@ -5,8 +5,8 @@ # id :integer not null, primary key # deploy_key_id :integer not null # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # require 'spec_helper' diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index 53ede0d5ee9..f415e750dd5 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -8,8 +8,8 @@ # title :string(255) # data :text # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # action :integer # author_id :integer # diff --git a/spec/models/flowdock_service_spec.rb b/spec/models/flowdock_service_spec.rb index 97414585331..25ad133e122 100644 --- a/spec/models/flowdock_service_spec.rb +++ b/spec/models/flowdock_service_spec.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/spec/models/forked_project_link_spec.rb b/spec/models/forked_project_link_spec.rb index e719e3bfcc8..1845c6103f5 100644 --- a/spec/models/forked_project_link_spec.rb +++ b/spec/models/forked_project_link_spec.rb @@ -5,8 +5,8 @@ # id :integer not null, primary key # forked_to_project_id :integer not null # forked_from_project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # require 'spec_helper' diff --git a/spec/models/gemnasium_service_spec.rb b/spec/models/gemnasium_service_spec.rb index dfc99849d60..efdf0dc891b 100644 --- a/spec/models/gemnasium_service_spec.rb +++ b/spec/models/gemnasium_service_spec.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/spec/models/gitlab_ci_service_spec.rb b/spec/models/gitlab_ci_service_spec.rb index 8ec15cb3466..a0708f14236 100644 --- a/spec/models/gitlab_ci_service_spec.rb +++ b/spec/models/gitlab_ci_service_spec.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index 686e43d8d10..8259ed88d83 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -6,10 +6,11 @@ # name :string(255) not null # path :string(255) not null # owner_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) # description :string(255) default(""), not null +# avatar :string(255) # require 'spec_helper' diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index 75155d5dc1d..d53c4037c35 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -7,8 +7,8 @@ # assignee_id :integer # author_id :integer # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # position :integer default(0) # branch_name :string(255) # description :text diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb index c1c6c2f31b7..474067fe38a 100644 --- a/spec/models/key_spec.rb +++ b/spec/models/key_spec.rb @@ -4,8 +4,8 @@ # # id :integer not null, primary key # user_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # key :text # title :string(255) # type :string(255) diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index f1ad679b658..a10673fda9c 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -9,10 +9,8 @@ # author_id :integer # assignee_id :integer # title :string(255) -# created_at :datetime not null -# updated_at :datetime not null -# st_commits :text(2147483647) -# st_diffs :text(2147483647) +# created_at :datetime +# updated_at :datetime # milestone_id :integer # state :string(255) # merge_status :string(255) diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb index b41012a3b8c..8309ad3a724 100644 --- a/spec/models/milestone_spec.rb +++ b/spec/models/milestone_spec.rb @@ -7,8 +7,8 @@ # project_id :integer not null # description :text # due_date :date -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # state :string(255) # iid :integer # diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb index c38554e2f77..d2bf96979f9 100644 --- a/spec/models/namespace_spec.rb +++ b/spec/models/namespace_spec.rb @@ -6,10 +6,11 @@ # name :string(255) not null # path :string(255) not null # owner_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) # description :string(255) default(""), not null +# avatar :string(255) # require 'spec_helper' diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index 4cdda1feb31..43779e6bbfc 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -6,15 +6,15 @@ # note :text # noteable_type :string(255) # author_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # project_id :integer # attachment :string(255) # line_code :string(255) # commit_id :string(255) # noteable_id :integer -# st_diff :text # system :boolean default(FALSE), not null +# st_diff :text # require 'spec_helper' diff --git a/spec/models/project_hook_spec.rb b/spec/models/project_hook_spec.rb index 7bd7c431bcd..4e0d50d7f3f 100644 --- a/spec/models/project_hook_spec.rb +++ b/spec/models/project_hook_spec.rb @@ -1,3 +1,20 @@ +# == Schema Information +# +# Table name: web_hooks +# +# id :integer not null, primary key +# url :string(255) +# project_id :integer +# created_at :datetime +# updated_at :datetime +# type :string(255) default("ProjectHook") +# service_id :integer +# push_events :boolean default(TRUE), not null +# issues_events :boolean default(FALSE), not null +# merge_requests_events :boolean default(FALSE), not null +# tag_push_events :boolean default(FALSE) +# + require 'spec_helper' describe ProjectHook do diff --git a/spec/models/project_snippet_spec.rb b/spec/models/project_snippet_spec.rb index d3a46ebbb84..42147179387 100644 --- a/spec/models/project_snippet_spec.rb +++ b/spec/models/project_snippet_spec.rb @@ -4,11 +4,11 @@ # # id :integer not null, primary key # title :string(255) -# content :text(2147483647) +# content :text # author_id :integer not null # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # file_name :string(255) # expires_at :datetime # private :boolean default(TRUE), not null diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index b84202352fc..b42d7bfe606 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -6,8 +6,8 @@ # name :string(255) # path :string(255) # description :text -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # creator_id :integer # issues_enabled :boolean default(TRUE), not null # wall_enabled :boolean default(TRUE), not null @@ -18,10 +18,10 @@ # issues_tracker_id :string(255) # snippets_enabled :boolean default(TRUE), not null # last_activity_at :datetime -# imported :boolean default(FALSE), not null # import_url :string(255) # visibility_level :integer default(0), not null # archived :boolean default(FALSE), not null +# import_status :string(255) # require 'spec_helper' diff --git a/spec/models/protected_branch_spec.rb b/spec/models/protected_branch_spec.rb index 6e830393e32..35b929c2f3e 100644 --- a/spec/models/protected_branch_spec.rb +++ b/spec/models/protected_branch_spec.rb @@ -5,8 +5,8 @@ # id :integer not null, primary key # project_id :integer not null # name :string(255) not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # require 'spec_helper' diff --git a/spec/models/service_hook_spec.rb b/spec/models/service_hook_spec.rb index 40a5fbc71d9..6ec82438dfe 100644 --- a/spec/models/service_hook_spec.rb +++ b/spec/models/service_hook_spec.rb @@ -5,13 +5,14 @@ # id :integer not null, primary key # url :string(255) # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null # merge_requests_events :boolean default(FALSE), not null +# tag_push_events :boolean default(FALSE) # require "spec_helper" diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index 94542074967..a4bed81c0f6 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/spec/models/slack_service_spec.rb b/spec/models/slack_service_spec.rb index 387455cb25e..b00eb30569b 100644 --- a/spec/models/slack_service_spec.rb +++ b/spec/models/slack_service_spec.rb @@ -7,12 +7,13 @@ # title :string(255) # token :string(255) # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # active :boolean default(FALSE), not null # project_url :string(255) # subdomain :string(255) # room :string(255) +# recipients :text # api_key :string(255) # diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb index 5fa397207c7..a77c594aaf1 100644 --- a/spec/models/snippet_spec.rb +++ b/spec/models/snippet_spec.rb @@ -4,11 +4,11 @@ # # id :integer not null, primary key # title :string(255) -# content :text(2147483647) +# content :text # author_id :integer not null # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # file_name :string(255) # expires_at :datetime # private :boolean default(TRUE), not null diff --git a/spec/models/system_hook_spec.rb b/spec/models/system_hook_spec.rb index 6a0d99dcc53..73144397301 100644 --- a/spec/models/system_hook_spec.rb +++ b/spec/models/system_hook_spec.rb @@ -5,13 +5,14 @@ # id :integer not null, primary key # url :string(255) # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null # merge_requests_events :boolean default(FALSE), not null +# tag_push_events :boolean default(FALSE) # require "spec_helper" diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index fef6314f23a..34a5bcfb4a5 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -2,47 +2,48 @@ # # Table name: users # -# id :integer not null, primary key -# email :string(255) default(""), not null -# encrypted_password :string(255) default(""), not null -# reset_password_token :string(255) -# reset_password_sent_at :datetime -# remember_created_at :datetime -# sign_in_count :integer default(0) -# current_sign_in_at :datetime -# last_sign_in_at :datetime -# current_sign_in_ip :string(255) -# last_sign_in_ip :string(255) -# created_at :datetime not null -# updated_at :datetime not null -# name :string(255) -# admin :boolean default(FALSE), not null -# projects_limit :integer default(10) -# skype :string(255) default(""), not null -# linkedin :string(255) default(""), not null -# twitter :string(255) default(""), not null -# authentication_token :string(255) -# theme_id :integer default(1), not null -# bio :string(255) -# failed_attempts :integer default(0) -# locked_at :datetime -# extern_uid :string(255) -# provider :string(255) -# username :string(255) -# can_create_group :boolean default(TRUE), not null -# can_create_team :boolean default(TRUE), not null -# state :string(255) -# color_scheme_id :integer default(1), not null -# notification_level :integer default(1), not null -# password_expires_at :datetime -# created_by_id :integer -# avatar :string(255) -# confirmation_token :string(255) -# confirmed_at :datetime -# confirmation_sent_at :datetime -# unconfirmed_email :string(255) -# hide_no_ssh_key :boolean default(FALSE) -# website_url :string(255) default(""), not null +# id :integer not null, primary key +# email :string(255) default(""), not null +# encrypted_password :string(255) default(""), not null +# reset_password_token :string(255) +# reset_password_sent_at :datetime +# remember_created_at :datetime +# sign_in_count :integer default(0) +# current_sign_in_at :datetime +# last_sign_in_at :datetime +# current_sign_in_ip :string(255) +# last_sign_in_ip :string(255) +# created_at :datetime +# updated_at :datetime +# name :string(255) +# admin :boolean default(FALSE), not null +# projects_limit :integer default(10) +# skype :string(255) default(""), not null +# linkedin :string(255) default(""), not null +# twitter :string(255) default(""), not null +# authentication_token :string(255) +# theme_id :integer default(1), not null +# bio :string(255) +# failed_attempts :integer default(0) +# locked_at :datetime +# extern_uid :string(255) +# provider :string(255) +# username :string(255) +# can_create_group :boolean default(TRUE), not null +# can_create_team :boolean default(TRUE), not null +# state :string(255) +# color_scheme_id :integer default(1), not null +# notification_level :integer default(1), not null +# password_expires_at :datetime +# created_by_id :integer +# last_credential_check_at :datetime +# avatar :string(255) +# confirmation_token :string(255) +# confirmed_at :datetime +# confirmation_sent_at :datetime +# unconfirmed_email :string(255) +# hide_no_ssh_key :boolean default(FALSE) +# website_url :string(255) default(""), not null # require 'spec_helper' diff --git a/spec/models/users_group_spec.rb b/spec/models/users_group_spec.rb index 9264f2bc034..acecae07146 100644 --- a/spec/models/users_group_spec.rb +++ b/spec/models/users_group_spec.rb @@ -6,8 +6,8 @@ # group_access :integer not null # group_id :integer not null # user_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # notification_level :integer default(3), not null # diff --git a/spec/models/users_project_spec.rb b/spec/models/users_project_spec.rb index e289a592b03..aa4b8cb449b 100644 --- a/spec/models/users_project_spec.rb +++ b/spec/models/users_project_spec.rb @@ -5,8 +5,8 @@ # id :integer not null, primary key # user_id :integer not null # project_id :integer not null -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # project_access :integer default(0), not null # notification_level :integer default(3), not null # diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb index d6034081018..20ee1416125 100644 --- a/spec/models/web_hook_spec.rb +++ b/spec/models/web_hook_spec.rb @@ -5,13 +5,14 @@ # id :integer not null, primary key # url :string(255) # project_id :integer -# created_at :datetime not null -# updated_at :datetime not null +# created_at :datetime +# updated_at :datetime # type :string(255) default("ProjectHook") # service_id :integer # push_events :boolean default(TRUE), not null # issues_events :boolean default(FALSE), not null # merge_requests_events :boolean default(FALSE), not null +# tag_push_events :boolean default(FALSE) # require 'spec_helper' |