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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
7adb9d45
Commit
7adb9d45
authored
May 25, 2021
by
Alex Kalderimis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename buildkite_service to buildkite_integration
Part of service => integration renaming effort
parent
313c82d0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
app/models/integration.rb
app/models/integration.rb
+6
-3
app/models/project.rb
app/models/project.rb
+1
-1
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
No files found.
app/models/integration.rb
View file @
7adb9d45
...
...
@@ -38,6 +38,12 @@ class Integration < ApplicationRecord
Integrations::BaseSlashCommands
]
.
freeze
# used as part of the renaming effort (https://gitlab.com/groups/gitlab-org/-/epics/2504)
RENAMED_TO_INTEGRATION
=
%w[
asana assembla
bamboo bugzilla buildkite
]
.
to_set
.
freeze
serialize
:properties
,
JSON
# rubocop:disable Cop/ActiveRecordSerialize
attribute
:type
,
Gitlab
::
Integrations
::
StiType
.
new
...
...
@@ -228,9 +234,6 @@ class Integration < ApplicationRecord
service_names
.
sort_by
(
&
:downcase
)
end
# used as part of the renaming effort
RENAMED_TO_INTEGRATION
=
%w[asana assembla bamboo bugzilla]
.
freeze
def
self
.
available_integration_names
(
**
args
)
available_services_names
(
**
args
)
.
select
{
RENAMED_TO_INTEGRATION
.
include?
(
_1
)
}
...
...
app/models/project.rb
View file @
7adb9d45
...
...
@@ -159,7 +159,7 @@ class Project < ApplicationRecord
has_one
:assembla_integration
,
class_name:
'Integrations::Assembla'
has_one
:bamboo_integration
,
class_name:
'Integrations::Bamboo'
has_one
:bugzilla_integration
,
class_name:
'Integrations::Bugzilla'
has_one
:buildkite_
service
,
class_name:
'Integrations::Buildkite'
has_one
:buildkite_
integration
,
class_name:
'Integrations::Buildkite'
has_one
:campfire_service
,
class_name:
'Integrations::Campfire'
has_one
:confluence_service
,
class_name:
'Integrations::Confluence'
has_one
:custom_issue_tracker_service
,
class_name:
'Integrations::CustomIssueTracker'
...
...
spec/lib/gitlab/import_export/all_models.yml
View file @
7adb9d45
...
...
@@ -383,7 +383,7 @@ project:
-
mattermost_service
-
hangouts_chat_service
-
unify_circuit_service
-
buildkite_
service
-
buildkite_
integration
-
bamboo_integration
-
teamcity_service
-
pushover_service
...
...
spec/models/project_spec.rb
View file @
7adb9d45
...
...
@@ -57,7 +57,7 @@ RSpec.describe Project, factory_default: :keep do
it
{
is_expected
.
to
have_one
(
:assembla_integration
)
}
it
{
is_expected
.
to
have_one
(
:slack_slash_commands_service
)
}
it
{
is_expected
.
to
have_one
(
:mattermost_slash_commands_service
)
}
it
{
is_expected
.
to
have_one
(
:buildkite_
service
)
}
it
{
is_expected
.
to
have_one
(
:buildkite_
integration
)
}
it
{
is_expected
.
to
have_one
(
:bamboo_integration
)
}
it
{
is_expected
.
to
have_one
(
:teamcity_service
)
}
it
{
is_expected
.
to
have_one
(
:jira_service
)
}
...
...
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