Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
178b6014
Commit
178b6014
authored
Feb 14, 2017
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deprecated CI service
parent
865e3fcc
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
10 deletions
+21
-10
app/models/project_services/gitlab_ci_service.rb
app/models/project_services/gitlab_ci_service.rb
+0
-8
app/models/service.rb
app/models/service.rb
+1
-1
changelogs/unreleased/zj-remove-deprecated-ci-service.yml
changelogs/unreleased/zj-remove-deprecated-ci-service.yml
+4
-0
db/post_migrate/20170214111112_delete_deprecated_gitlab_ci_service.rb
...ate/20170214111112_delete_deprecated_gitlab_ci_service.rb
+15
-0
db/schema.rb
db/schema.rb
+1
-1
No files found.
app/models/project_services/gitlab_ci_service.rb
deleted
100644 → 0
View file @
865e3fcc
# TODO(ayufan): The GitLabCiService is deprecated and the type should be removed when the database entries are removed
class
GitlabCiService
<
CiService
# We override the active accessor to always make GitLabCiService disabled
# Otherwise the GitLabCiService can be picked, but should never be since it's deprecated
def
active
false
end
end
app/models/service.rb
View file @
178b6014
...
@@ -27,7 +27,7 @@ class Service < ActiveRecord::Base
...
@@ -27,7 +27,7 @@ class Service < ActiveRecord::Base
validates
:project_id
,
presence:
true
,
unless:
Proc
.
new
{
|
service
|
service
.
template?
}
validates
:project_id
,
presence:
true
,
unless:
Proc
.
new
{
|
service
|
service
.
template?
}
scope
:visible
,
->
{
where
.
not
(
type:
[
'GitlabIssueTrackerService'
,
'GitlabCiService'
]
)
}
scope
:visible
,
->
{
where
.
not
(
type:
'GitlabIssueTrackerService'
)
}
scope
:issue_trackers
,
->
{
where
(
category:
'issue_tracker'
)
}
scope
:issue_trackers
,
->
{
where
(
category:
'issue_tracker'
)
}
scope
:external_wikis
,
->
{
where
(
type:
'ExternalWikiService'
).
active
}
scope
:external_wikis
,
->
{
where
(
type:
'ExternalWikiService'
).
active
}
scope
:active
,
->
{
where
(
active:
true
)
}
scope
:active
,
->
{
where
(
active:
true
)
}
...
...
changelogs/unreleased/zj-remove-deprecated-ci-service.yml
0 → 100644
View file @
178b6014
---
title
:
Remove deprecated GitlabCiService
merge_request
:
author
:
db/post_migrate/20170214111112_delete_deprecated_gitlab_ci_service.rb
0 → 100644
View file @
178b6014
class
DeleteDeprecatedGitlabCiService
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
DOWNTIME
=
false
def
up
disable_statement_timeout
execute
(
"DELETE FROM services WHERE type = 'GitlabCiService';"
)
end
def
down
# noop
end
end
db/schema.rb
View file @
178b6014
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended that you check this file into your version control system.
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
2017021
007592
2
)
do
ActiveRecord
::
Schema
.
define
(
version:
2017021
411111
2
)
do
# These are extensions that must be enabled in order to support this database
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
enable_extension
"plpgsql"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment