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
e7cd2b97
Commit
e7cd2b97
authored
Jan 24, 2017
by
Tiago Botelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes the test suite for the service api file
parent
f544b977
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
app/models/project_services/jenkins_deprecated_service.rb
app/models/project_services/jenkins_deprecated_service.rb
+1
-1
app/models/project_services/jenkins_service.rb
app/models/project_services/jenkins_service.rb
+2
-2
lib/api/services.rb
lib/api/services.rb
+2
-0
No files found.
app/models/project_services/jenkins_deprecated_service.rb
View file @
e7cd2b97
...
@@ -33,7 +33,7 @@ class JenkinsDeprecatedService < CiService
...
@@ -33,7 +33,7 @@ class JenkinsDeprecatedService < CiService
'is deprecated. Use "Jenkins CI" service instead.'
'is deprecated. Use "Jenkins CI" service instead.'
end
end
def
to_param
def
self
.
to_param
'jenkins_deprecated'
'jenkins_deprecated'
end
end
...
...
app/models/project_services/jenkins_service.rb
View file @
e7cd2b97
...
@@ -52,7 +52,7 @@ class JenkinsService < CiService
...
@@ -52,7 +52,7 @@ class JenkinsService < CiService
File
.
join
(
jenkins_url
,
"project/
#{
project_name
}
"
).
to_s
File
.
join
(
jenkins_url
,
"project/
#{
project_name
}
"
).
to_s
end
end
def
supported_events
def
s
elf
.
s
upported_events
%w(push merge_request tag_push)
%w(push merge_request tag_push)
end
end
...
@@ -68,7 +68,7 @@ class JenkinsService < CiService
...
@@ -68,7 +68,7 @@ class JenkinsService < CiService
'You must have installed the Git Plugin and GitLab Plugin in Jenkins'
'You must have installed the Git Plugin and GitLab Plugin in Jenkins'
end
end
def
to_param
def
self
.
to_param
'jenkins'
'jenkins'
end
end
...
...
lib/api/services.rb
View file @
e7cd2b97
...
@@ -609,6 +609,8 @@ module API
...
@@ -609,6 +609,8 @@ module API
SlackService
,
SlackService
,
MattermostService
,
MattermostService
,
TeamcityService
,
TeamcityService
,
JenkinsService
,
JenkinsDeprecatedService
].
freeze
].
freeze
trigger_services
=
{
trigger_services
=
{
...
...
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