Skip to content

Commit 591885c

Browse files
rymairymai
committed
Merge branch 'group_approvers' into 'master'
 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
2 parents 187dd50 + 8b2dbe8 commit 591885c

30 files changed

+1
-569
lines changed

‎spec/factories/ci/runner_projects.rb

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: runner_projects
4-
#
5-
# id :integer not null, primary key
6-
# runner_id :integer not null
7-
# project_id :integer not null
8-
# created_at :datetime
9-
# updated_at :datetime
10-
#
11-
121
FactoryGirl.define do
132
factory :ci_runner_project, class: Ci::RunnerProject do
143
runner_id 1

‎spec/factories/ci/runners.rb

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: runners
4-
#
5-
# id :integer not null, primary key
6-
# token :string(255)
7-
# created_at :datetime
8-
# updated_at :datetime
9-
# description :string(255)
10-
# contacted_at :datetime
11-
# active :boolean default(TRUE), not null
12-
# is_shared :boolean default(FALSE)
13-
# name :string(255)
14-
# version :string(255)
15-
# revision :string(255)
16-
# platform :string(255)
17-
# architecture :string(255)
18-
#
19-
201
FactoryGirl.define do
212
factory :ci_runner, class: Ci::Runner do
223
sequence :description do |n|

‎spec/factories/ci/variables.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: ci_variables
4-
#
5-
# id :integer not null, primary key
6-
# project_id :integer not null
7-
# key :string(255)
8-
# value :text
9-
# encrypted_value :text
10-
# encrypted_value_salt :string(255)
11-
# encrypted_value_iv :string(255)
12-
# gl_project_id :integer
13-
#
14-
151
FactoryGirl.define do
162
factory :ci_variable, class: Ci::Variable do
173
sequence(:key) { |n| "VARIABLE_#{n}" }

‎spec/factories/group_members.rb

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: group_members
4-
#
5-
# id :integer not null, primary key
6-
# group_access :integer not null
7-
# group_id :integer not null
8-
# user_id :integer not null
9-
# created_at :datetime
10-
# updated_at :datetime
11-
# notification_level :integer default(3), not null
12-
#
13-
141
FactoryGirl.define do
152
factory :group_member do
163
access_level { GroupMember::OWNER }

‎spec/models/hooks/project_hook_spec.rb

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: web_hooks
4-
#
5-
# id :integer not null, primary key
6-
# url :string(255)
7-
# project_id :integer
8-
# created_at :datetime
9-
# updated_at :datetime
10-
# type :string(255) default("ProjectHook")
11-
# service_id :integer
12-
# push_events :boolean default(TRUE), not null
13-
# issues_events :boolean default(FALSE), not null
14-
# merge_requests_events :boolean default(FALSE), not null
15-
# tag_push_events :boolean default(FALSE)
16-
# note_events :boolean default(FALSE), not null
17-
#
18-
191
require 'spec_helper'
202

213
describe ProjectHook, models: true do

‎spec/models/hooks/service_hook_spec.rb

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: web_hooks
4-
#
5-
# id :integer not null, primary key
6-
# url :string(255)
7-
# project_id :integer
8-
# created_at :datetime
9-
# updated_at :datetime
10-
# type :string(255) default("ProjectHook")
11-
# service_id :integer
12-
# push_events :boolean default(TRUE), not null
13-
# issues_events :boolean default(FALSE), not null
14-
# merge_requests_events :boolean default(FALSE), not null
15-
# tag_push_events :boolean default(FALSE)
16-
# note_events :boolean default(FALSE), not null
17-
#
18-
191
require "spec_helper"
202

213
describe ServiceHook, models: true do

‎spec/models/hooks/system_hook_spec.rb

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: web_hooks
4-
#
5-
# id :integer not null, primary key
6-
# url :string(255)
7-
# project_id :integer
8-
# created_at :datetime
9-
# updated_at :datetime
10-
# type :string(255) default("ProjectHook")
11-
# service_id :integer
12-
# push_events :boolean default(TRUE), not null
13-
# issues_events :boolean default(FALSE), not null
14-
# merge_requests_events :boolean default(FALSE), not null
15-
# tag_push_events :boolean default(FALSE)
16-
# note_events :boolean default(FALSE), not null
17-
#
18-
191
require "spec_helper"
202

213
describe SystemHook, models: true do
@@ -48,7 +30,7 @@
4830

4931
it "user_create hook" do
5032
create(:user)
51-
33+
5234
expect(WebMock).to have_requested(:post, system_hook.url).with(
5335
body: /user_create/,
5436
headers: { 'Content-Type' => 'application/json', 'X-Gitlab-Event' => 'System Hook' }

‎spec/models/hooks/web_hook_spec.rb

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: web_hooks
4-
#
5-
# id :integer not null, primary key
6-
# url :string(255)
7-
# project_id :integer
8-
# created_at :datetime
9-
# updated_at :datetime
10-
# type :string(255) default("ProjectHook")
11-
# service_id :integer
12-
# push_events :boolean default(TRUE), not null
13-
# issues_events :boolean default(FALSE), not null
14-
# merge_requests_events :boolean default(FALSE), not null
15-
# tag_push_events :boolean default(FALSE)
16-
# note_events :boolean default(FALSE), not null
17-
#
18-
191
require 'spec_helper'
202

213
describe WebHook, models: true do

‎spec/models/members/group_member_spec.rb

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: members
4-
#
5-
# id :integer not null, primary key
6-
# access_level :integer not null
7-
# source_id :integer not null
8-
# source_type :string(255) not null
9-
# user_id :integer
10-
# notification_level :integer not null
11-
# type :string(255)
12-
# created_at :datetime
13-
# updated_at :datetime
14-
# created_by_id :integer
15-
# invite_email :string(255)
16-
# invite_token :string(255)
17-
# invite_accepted_at :datetime
18-
#
19-
201
require 'spec_helper'
212

223
describe GroupMember, models: true do

‎spec/models/members/project_member_spec.rb

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: members
4-
#
5-
# id :integer not null, primary key
6-
# access_level :integer not null
7-
# source_id :integer not null
8-
# source_type :string(255) not null
9-
# user_id :integer
10-
# notification_level :integer not null
11-
# type :string(255)
12-
# created_at :datetime
13-
# updated_at :datetime
14-
# created_by_id :integer
15-
# invite_email :string(255)
16-
# invite_token :string(255)
17-
# invite_accepted_at :datetime
18-
#
19-
201
require 'spec_helper'
212

223
describe ProjectMember, models: true do

‎spec/models/project_services/asana_service_spec.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: services
4-
#
5-
# id :integer not null, primary key
6-
# type :string(255)
7-
# title :string(255)
8-
# project_id :integer
9-
# created_at :datetime
10-
# updated_at :datetime
11-
# active :boolean default(FALSE), not null
12-
# properties :text
13-
# template :boolean default(FALSE)
14-
# push_events :boolean default(TRUE)
15-
# issues_events :boolean default(TRUE)
16-
# merge_requests_events :boolean default(TRUE)
17-
# tag_push_events :boolean default(TRUE)
18-
# note_events :boolean default(TRUE), not null
19-
#
20-
211
require 'spec_helper'
222

233
describe AsanaService, models: true do

‎spec/models/project_services/assembla_service_spec.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: services
4-
#
5-
# id :integer not null, primary key
6-
# type :string(255)
7-
# title :string(255)
8-
# project_id :integer
9-
# created_at :datetime
10-
# updated_at :datetime
11-
# active :boolean default(FALSE), not null
12-
# properties :text
13-
# template :boolean default(FALSE)
14-
# push_events :boolean default(TRUE)
15-
# issues_events :boolean default(TRUE)
16-
# merge_requests_events :boolean default(TRUE)
17-
# tag_push_events :boolean default(TRUE)
18-
# note_events :boolean default(TRUE), not null
19-
#
20-
211
require 'spec_helper'
222

233
describe AssemblaService, models: true do

‎spec/models/project_services/bamboo_service_spec.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: services
4-
#
5-
# id :integer not null, primary key
6-
# type :string(255)
7-
# title :string(255)
8-
# project_id :integer
9-
# created_at :datetime
10-
# updated_at :datetime
11-
# active :boolean default(FALSE), not null
12-
# properties :text
13-
# template :boolean default(FALSE)
14-
# push_events :boolean default(TRUE)
15-
# issues_events :boolean default(TRUE)
16-
# merge_requests_events :boolean default(TRUE)
17-
# tag_push_events :boolean default(TRUE)
18-
# note_events :boolean default(TRUE), not null
19-
#
20-
211
require 'spec_helper'
222

233
describe BambooService, models: true do

‎spec/models/project_services/bugzilla_service_spec.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: services
4-
#
5-
# id :integer not null, primary key
6-
# type :string(255)
7-
# title :string(255)
8-
# project_id :integer
9-
# created_at :datetime
10-
# updated_at :datetime
11-
# active :boolean default(FALSE), not null
12-
# properties :text
13-
# template :boolean default(FALSE)
14-
# push_events :boolean default(TRUE)
15-
# issues_events :boolean default(TRUE)
16-
# merge_requests_events :boolean default(TRUE)
17-
# tag_push_events :boolean default(TRUE)
18-
# note_events :boolean default(TRUE), not null
19-
#
20-
211
require 'spec_helper'
222

233
describe BugzillaService, models: true do

‎spec/models/project_services/buildkite_service_spec.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: services
4-
#
5-
# id :integer not null, primary key
6-
# type :string(255)
7-
# title :string(255)
8-
# project_id :integer
9-
# created_at :datetime
10-
# updated_at :datetime
11-
# active :boolean default(FALSE), not null
12-
# properties :text
13-
# template :boolean default(FALSE)
14-
# push_events :boolean default(TRUE)
15-
# issues_events :boolean default(TRUE)
16-
# merge_requests_events :boolean default(TRUE)
17-
# tag_push_events :boolean default(TRUE)
18-
# note_events :boolean default(TRUE), not null
19-
#
20-
211
require 'spec_helper'
222

233
describe BuildkiteService, models: true do

‎spec/models/project_services/campfire_service_spec.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: services
4-
#
5-
# id :integer not null, primary key
6-
# type :string(255)
7-
# title :string(255)
8-
# project_id :integer
9-
# created_at :datetime
10-
# updated_at :datetime
11-
# active :boolean default(FALSE), not null
12-
# properties :text
13-
# template :boolean default(FALSE)
14-
# push_events :boolean default(TRUE)
15-
# issues_events :boolean default(TRUE)
16-
# merge_requests_events :boolean default(TRUE)
17-
# tag_push_events :boolean default(TRUE)
18-
# note_events :boolean default(TRUE), not null
19-
#
20-
211
require 'spec_helper'
222

233
describe CampfireService, models: true do

‎spec/models/project_services/custom_issue_tracker_service_spec.rb

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,3 @@
1-
# == Schema Information
2-
#
3-
# Table name: services
4-
#
5-
# id :integer not null, primary key
6-
# type :string(255)
7-
# title :string(255)
8-
# project_id :integer
9-
# created_at :datetime
10-
# updated_at :datetime
11-
# active :boolean default(FALSE), not null
12-
# properties :text
13-
# template :boolean default(FALSE)
14-
# push_events :boolean default(TRUE)
15-
# issues_events :boolean default(TRUE)
16-
# merge_requests_events :boolean default(TRUE)
17-
# tag_push_events :boolean default(TRUE)
18-
# note_events :boolean default(TRUE), not null
19-
#
20-
211
require 'spec_helper'
222

233
describe CustomIssueTrackerService, models: true do

0 commit comments

Comments
 (0)