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
96e2d92c
Commit
96e2d92c
authored
Mar 29, 2021
by
Arturo Herrero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build removing hipchat service
parent
2fd414cb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
app/models/project.rb
app/models/project.rb
+2
-2
app/models/service.rb
app/models/service.rb
+1
-1
doc/api/graphql/reference/index.md
doc/api/graphql/reference/index.md
+0
-1
spec/requests/api/services_spec.rb
spec/requests/api/services_spec.rb
+1
-1
No files found.
app/models/project.rb
View file @
96e2d92c
...
@@ -1370,9 +1370,9 @@ class Project < ApplicationRecord
...
@@ -1370,9 +1370,9 @@ class Project < ApplicationRecord
end
end
def
disabled_services
def
disabled_services
return
%w
(datadog hipchat)
unless
Feature
.
enabled?
(
:datadog_ci_integration
,
self
)
return
%w
[datadog hipchat]
unless
Feature
.
enabled?
(
:datadog_ci_integration
,
self
)
%w
(hipchat)
%w
[hipchat]
end
end
def
find_or_initialize_service
(
name
)
def
find_or_initialize_service
(
name
)
...
...
app/models/service.rb
View file @
96e2d92c
...
@@ -12,7 +12,7 @@ class Service < ApplicationRecord
...
@@ -12,7 +12,7 @@ class Service < ApplicationRecord
SERVICE_NAMES
=
%w[
SERVICE_NAMES
=
%w[
asana assembla bamboo bugzilla buildkite campfire confluence custom_issue_tracker datadog discord
asana assembla bamboo bugzilla buildkite campfire confluence custom_issue_tracker datadog discord
drone_ci emails_on_push ewm external_wiki flowdock hangouts_chat
hipchat
irker jira
drone_ci emails_on_push ewm external_wiki flowdock hangouts_chat irker jira
mattermost mattermost_slash_commands microsoft_teams packagist pipelines_email
mattermost mattermost_slash_commands microsoft_teams packagist pipelines_email
pivotaltracker prometheus pushover redmine slack slack_slash_commands teamcity unify_circuit webex_teams youtrack
pivotaltracker prometheus pushover redmine slack slack_slash_commands teamcity unify_circuit webex_teams youtrack
]
.
freeze
]
.
freeze
...
...
doc/api/graphql/reference/index.md
View file @
96e2d92c
...
@@ -8013,7 +8013,6 @@ State of a Sentry error.
...
@@ -8013,7 +8013,6 @@ State of a Sentry error.
|
`FLOWDOCK_SERVICE`
| FlowdockService type. |
|
`FLOWDOCK_SERVICE`
| FlowdockService type. |
|
`GITHUB_SERVICE`
| GithubService type. |
|
`GITHUB_SERVICE`
| GithubService type. |
|
`HANGOUTS_CHAT_SERVICE`
| HangoutsChatService type. |
|
`HANGOUTS_CHAT_SERVICE`
| HangoutsChatService type. |
|
`HIPCHAT_SERVICE`
| HipchatService type. |
|
`IRKER_SERVICE`
| IrkerService type. |
|
`IRKER_SERVICE`
| IrkerService type. |
|
`JENKINS_SERVICE`
| JenkinsService type. |
|
`JENKINS_SERVICE`
| JenkinsService type. |
|
`JIRA_SERVICE`
| JiraService type. |
|
`JIRA_SERVICE`
| JiraService type. |
...
...
spec/requests/api/services_spec.rb
View file @
96e2d92c
...
@@ -42,7 +42,7 @@ RSpec.describe API::Services do
...
@@ -42,7 +42,7 @@ RSpec.describe API::Services do
end
end
end
end
(
Service
.
available_services_names
-
Project
.
new
.
disabled_services
)
.
each
do
|
service
|
Service
.
available_services_names
.
each
do
|
service
|
describe
"PUT /projects/:id/services/
#{
service
.
dasherize
}
"
do
describe
"PUT /projects/:id/services/
#{
service
.
dasherize
}
"
do
include_context
service
include_context
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