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
Kazuhiko Shiozaki
gitlab-ce
Commits
f13567ed
Commit
f13567ed
authored
Feb 24, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only execute GitlabCiService for push events.
parent
d86c0cda
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
app/models/project_services/gitlab_ci_service.rb
app/models/project_services/gitlab_ci_service.rb
+7
-2
No files found.
app/models/project_services/gitlab_ci_service.rb
View file @
f13567ed
...
@@ -22,8 +22,6 @@ class GitlabCiService < CiService
...
@@ -22,8 +22,6 @@ class GitlabCiService < CiService
validates
:project_url
,
presence:
true
,
if: :activated?
validates
:project_url
,
presence:
true
,
if: :activated?
validates
:token
,
presence:
true
,
if: :activated?
validates
:token
,
presence:
true
,
if: :activated?
delegate
:execute
,
to: :service_hook
,
prefix:
nil
after_save
:compose_service_hook
,
if: :activated?
after_save
:compose_service_hook
,
if: :activated?
def
compose_service_hook
def
compose_service_hook
...
@@ -32,6 +30,13 @@ class GitlabCiService < CiService
...
@@ -32,6 +30,13 @@ class GitlabCiService < CiService
hook
.
save
hook
.
save
end
end
def
execute
(
data
)
object_kind
=
data
[
:object_kind
]
return
unless
object_kind
==
"push"
service_hook
.
execute
(
data
)
end
def
commit_status_path
(
sha
)
def
commit_status_path
(
sha
)
project_url
+
"/commits/
#{
sha
}
/status.json?token=
#{
token
}
"
project_url
+
"/commits/
#{
sha
}
/status.json?token=
#{
token
}
"
end
end
...
...
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