Skip to content

Commit

Permalink
Merge branch 'group_approvers' into 'master'
Browse files Browse the repository at this point in the history 
Remove schema annotations completely

It removes schema annotations completely. The https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4099 has not done that

See merge request !6386
  • Loading branch information
@rymai
rymai committed Sep 16, 2016
2 parents 187dd50 + 8b2dbe8 commit 591885c
Show file tree
Hide file tree
Showing 30 changed files with 1 addition and 569 deletions.
11 changes: 0 additions & 11 deletions spec/factories/ci/runner_projects.rb
View file
@@ -1,14 +1,3 @@
# == Schema Information
#
# Table name: runner_projects
#
# id :integer not null, primary key
# runner_id :integer not null
# project_id :integer not null
# created_at :datetime
# updated_at :datetime
#

FactoryGirl.define do
factory :ci_runner_project, class: Ci::RunnerProject do
runner_id 1
Expand Down
19 changes: 0 additions & 19 deletions spec/factories/ci/runners.rb
View file
@@ -1,22 +1,3 @@
# == Schema Information
#
# Table name: runners
#
# id :integer not null, primary key
# token :string(255)
# created_at :datetime
# updated_at :datetime
# description :string(255)
# contacted_at :datetime
# active :boolean default(TRUE), not null
# is_shared :boolean default(FALSE)
# name :string(255)
# version :string(255)
# revision :string(255)
# platform :string(255)
# architecture :string(255)
#

FactoryGirl.define do
factory :ci_runner, class: Ci::Runner do
sequence :description do |n|
Expand Down
14 changes: 0 additions & 14 deletions spec/factories/ci/variables.rb
View file
@@ -1,17 +1,3 @@
# == Schema Information
#
# Table name: ci_variables
#
# id :integer not null, primary key
# project_id :integer not null
# key :string(255)
# value :text
# encrypted_value :text
# encrypted_value_salt :string(255)
# encrypted_value_iv :string(255)
# gl_project_id :integer
#

FactoryGirl.define do
factory :ci_variable, class: Ci::Variable do
sequence(:key) { |n| "VARIABLE_#{n}" }
Expand Down
13 changes: 0 additions & 13 deletions spec/factories/group_members.rb
View file
@@ -1,16 +1,3 @@
# == Schema Information
#
# Table name: group_members
#
# id :integer not null, primary key
# group_access :integer not null
# group_id :integer not null
# user_id :integer not null
# created_at :datetime
# updated_at :datetime
# notification_level :integer default(3), not null
#

FactoryGirl.define do
factory :group_member do
access_level { GroupMember::OWNER }
Expand Down
18 changes: 0 additions & 18 deletions spec/models/hooks/project_hook_spec.rb
View file
@@ -1,21 +1,3 @@
# == 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)
# note_events :boolean default(FALSE), not null
#

require 'spec_helper'

describe ProjectHook, models: true do
Expand Down
18 changes: 0 additions & 18 deletions spec/models/hooks/service_hook_spec.rb
View file
@@ -1,21 +1,3 @@
# == 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)
# note_events :boolean default(FALSE), not null
#

require "spec_helper"

describe ServiceHook, models: true do
Expand Down
20 changes: 1 addition & 19 deletions spec/models/hooks/system_hook_spec.rb
View file
@@ -1,21 +1,3 @@
# == 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)
# note_events :boolean default(FALSE), not null
#

require "spec_helper"

describe SystemHook, models: true do
Expand Down Expand Up @@ -48,7 +30,7 @@

it "user_create hook" do
create(:user)

expect(WebMock).to have_requested(:post, system_hook.url).with(
body: /user_create/,
headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }
Expand Down
18 changes: 0 additions & 18 deletions spec/models/hooks/web_hook_spec.rb
View file
@@ -1,21 +1,3 @@
# == 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)
# note_events :boolean default(FALSE), not null
#

require 'spec_helper'

describe WebHook, models: true do
Expand Down
19 changes: 0 additions & 19 deletions spec/models/members/group_member_spec.rb
View file
@@ -1,22 +1,3 @@
# == 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
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#

require 'spec_helper'

describe GroupMember, models: true do
Expand Down
19 changes: 0 additions & 19 deletions spec/models/members/project_member_spec.rb
View file
@@ -1,22 +1,3 @@
# == 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
# notification_level :integer not null
# type :string(255)
# created_at :datetime
# updated_at :datetime
# created_by_id :integer
# invite_email :string(255)
# invite_token :string(255)
# invite_accepted_at :datetime
#

require 'spec_helper'

describe ProjectMember, models: true do
Expand Down
20 changes: 0 additions & 20 deletions spec/models/project_services/asana_service_spec.rb
View file
@@ -1,23 +1,3 @@
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#

require 'spec_helper'

describe AsanaService, models: true do
Expand Down
20 changes: 0 additions & 20 deletions spec/models/project_services/assembla_service_spec.rb
View file
@@ -1,23 +1,3 @@
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#

require 'spec_helper'

describe AssemblaService, models: true do
Expand Down
20 changes: 0 additions & 20 deletions spec/models/project_services/bamboo_service_spec.rb
View file
@@ -1,23 +1,3 @@
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#

require 'spec_helper'

describe BambooService, models: true do
Expand Down
20 changes: 0 additions & 20 deletions spec/models/project_services/bugzilla_service_spec.rb
View file
@@ -1,23 +1,3 @@
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#

require 'spec_helper'

describe BugzillaService, models: true do
Expand Down
20 changes: 0 additions & 20 deletions spec/models/project_services/buildkite_service_spec.rb
View file
@@ -1,23 +1,3 @@
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#

require 'spec_helper'

describe BuildkiteService, models: true do
Expand Down
20 changes: 0 additions & 20 deletions spec/models/project_services/campfire_service_spec.rb
View file
@@ -1,23 +1,3 @@
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#

require 'spec_helper'

describe CampfireService, models: true do
Expand Down
20 changes: 0 additions & 20 deletions spec/models/project_services/custom_issue_tracker_service_spec.rb
View file
@@ -1,23 +1,3 @@
# == Schema Information
#
# Table name: services
#
# id :integer not null, primary key
# type :string(255)
# title :string(255)
# project_id :integer
# created_at :datetime
# updated_at :datetime
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
# push_events :boolean default(TRUE)
# issues_events :boolean default(TRUE)
# merge_requests_events :boolean default(TRUE)
# tag_push_events :boolean default(TRUE)
# note_events :boolean default(TRUE), not null
#

require 'spec_helper'

describe CustomIssueTrackerService, models: true do
Expand Down

0 comments on commit 591885c

Please sign in to comment.