Merge branch 'annotate' into 'master'

Annotate

See merge request !1167

app/models/member.rb

+# == Schema Information
+#
+# Table name: members
+#
+#  id                 :integer          not null, primary key
+#  access_level       :integer          not null
+#  source_id          :integer          not null
+#  source_type        :string(255)      not null
+#  user_id            :integer          not null
+#  notification_level :integer          not null
+#  type               :string(255)
+#  created_at         :datetime
+#  updated_at         :datetime
+#
+
 class Member < ActiveRecord::Base
   include Notifiable
   include Gitlab::Access

app/models/members/group_member.rb

+# == Schema Information
+#
+# Table name: members
+#
+#  id                 :integer          not null, primary key
+#  access_level       :integer          not null
+#  source_id          :integer          not null
+#  source_type        :string(255)      not null
+#  user_id            :integer          not null
+#  notification_level :integer          not null
+#  type               :string(255)
+#  created_at         :datetime
+#  updated_at         :datetime
+#
+
 class GroupMember < Member
   SOURCE_TYPE = 'Namespace'
 

app/models/members/project_member.rb

+# == Schema Information
+#
+# Table name: members
+#
+#  id                 :integer          not null, primary key
+#  access_level       :integer          not null
+#  source_id          :integer          not null
+#  source_type        :string(255)      not null
+#  user_id            :integer          not null
+#  notification_level :integer          not null
+#  type               :string(255)
+#  created_at         :datetime
+#  updated_at         :datetime
+#
+
 class ProjectMember < Member
   SOURCE_TYPE = 'Project'
 

app/models/personal_snippet.rb

@@ -11,8 +11,8 @@
 #  updated_at       :datetime
 #  file_name        :string(255)
 #  expires_at       :datetime
-#  private    :boolean          default(TRUE), not null
 #  type             :string(255)
+#  visibility_level :integer          default(0), not null
 #
 
 class PersonalSnippet < Snippet

app/models/project_services/buildbox_service.rb

@@ -9,7 +9,7 @@
 #  created_at :datetime
 #  updated_at :datetime
 #  active     :boolean          default(FALSE), not null
-#  property    :text
+#  properties :text
 #
 
 class BuildboxService < CiService

app/models/project_services/gitlab_ci_service.rb

@@ -9,7 +9,7 @@
 #  created_at :datetime
 #  updated_at :datetime
 #  active     :boolean          default(FALSE), not null
-#  property    :text
+#  properties :text
 #
 
 class GitlabCiService < CiService

app/models/project_snippet.rb

@@ -11,8 +11,8 @@
 #  updated_at       :datetime
 #  file_name        :string(255)
 #  expires_at       :datetime
-#  private    :boolean          default(TRUE), not null
 #  type             :string(255)
+#  visibility_level :integer          default(0), not null
 #
 
 class ProjectSnippet < Snippet

app/models/service.rb

@@ -10,6 +10,7 @@
 #  updated_at :datetime
 #  active     :boolean          default(FALSE), not null
 #  properties :text
+#
 
 # To add new service you should build a class inherited from Service
 # and implement a set of methods

app/models/snippet.rb

@@ -11,8 +11,8 @@
 #  updated_at       :datetime
 #  file_name        :string(255)
 #  expires_at       :datetime
-#  private    :boolean          default(TRUE), not null
 #  type             :string(255)
+#  visibility_level :integer          default(0), not null
 #
 
 class Snippet < ActiveRecord::Base

spec/models/buildbox_service_spec.rb

@@ -5,16 +5,11 @@
 #  id         :integer          not null, primary key
 #  type       :string(255)
 #  title      :string(255)
-#  token       :string(255)
 #  project_id :integer          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)
+#  properties :text
 #
 
 require 'spec_helper'

spec/models/group_member_spec.rb

 # == Schema Information
 #
-# Table name: group_members
+# Table name: members
 #
 #  id                 :integer          not null, primary key
 #  access_level       :integer          not null
-#  group_id           :integer          not null
+#  source_id          :integer          not null
+#  source_type        :string(255)      not null
 #  user_id            :integer          not null
+#  notification_level :integer          not null
+#  type               :string(255)
 #  created_at         :datetime
 #  updated_at         :datetime
-#  notification_level :integer          default(3), not null
 #
 
 require 'spec_helper'

spec/models/project_member_spec.rb

 # == Schema Information
 #
-# Table name: project_members
+# Table name: members
 #
 #  id                 :integer          not null, primary key
+#  access_level       :integer          not null
+#  source_id          :integer          not null
+#  source_type        :string(255)      not null
 #  user_id            :integer          not null
-#  project_id         :integer          not null
+#  notification_level :integer          not null
+#  type               :string(255)
 #  created_at         :datetime
 #  updated_at         :datetime
-#  project_access     :integer          default(0), not null
-#  notification_level :integer          default(3), not null
 #
 
 require 'spec_helper'

spec/models/project_snippet_spec.rb

@@ -11,8 +11,8 @@
 #  updated_at       :datetime
 #  file_name        :string(255)
 #  expires_at       :datetime
-#  private    :boolean          default(TRUE), not null
 #  type             :string(255)
+#  visibility_level :integer          default(0), not null
 #
 
 require 'spec_helper'

spec/models/snippet_spec.rb

@@ -11,8 +11,8 @@
 #  updated_at       :datetime
 #  file_name        :string(255)
 #  expires_at       :datetime
-#  private    :boolean          default(TRUE), not null
 #  type             :string(255)
+#  visibility_level :integer          default(0), not null
 #
 
 require 'spec_helper'