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
iv
gitlab-ce
Commits
2e9c1608
Commit
2e9c1608
authored
Oct 12, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix commit skipping
parent
789fe7b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
app/services/ci/create_commit_service.rb
app/services/ci/create_commit_service.rb
+5
-5
spec/models/ci/project_services/mail_service_spec.rb
spec/models/ci/project_services/mail_service_spec.rb
+2
-2
No files found.
app/services/ci/create_commit_service.rb
View file @
2e9c1608
...
@@ -17,11 +17,11 @@ module Ci
...
@@ -17,11 +17,11 @@ module Ci
tag
=
origin_ref
.
start_with?
(
'refs/tags/'
)
tag
=
origin_ref
.
start_with?
(
'refs/tags/'
)
commit
=
project
.
gl_project
.
ensure_ci_commit
(
sha
)
commit
=
project
.
gl_project
.
ensure_ci_commit
(
sha
)
return
false
if
commit
.
skip_ci?
unless
commit
.
skip_ci?
commit
.
update_committed!
commit
.
update_committed!
commit
.
create_builds
(
ref
,
tag
,
user
)
commit
.
create_builds
(
ref
,
tag
,
user
)
end
commit
commit
end
end
end
end
...
...
spec/models/ci/project_services/mail_service_spec.rb
View file @
2e9c1608
...
@@ -35,7 +35,7 @@ describe Ci::MailService do
...
@@ -35,7 +35,7 @@ describe Ci::MailService do
let
(
:project
)
{
FactoryGirl
.
create
(
:ci_project
,
email_add_pusher:
true
)
}
let
(
:project
)
{
FactoryGirl
.
create
(
:ci_project
,
email_add_pusher:
true
)
}
let
(
:gl_project
)
{
FactoryGirl
.
create
(
:empty_project
,
gitlab_ci_project:
project
)
}
let
(
:gl_project
)
{
FactoryGirl
.
create
(
:empty_project
,
gitlab_ci_project:
project
)
}
let
(
:commit
)
{
FactoryGirl
.
create
(
:ci_commit
,
gl_project:
gl_project
)
}
let
(
:commit
)
{
FactoryGirl
.
create
(
:ci_commit
,
gl_project:
gl_project
)
}
let
(
:build
)
{
FactoryGirl
.
create
(
:ci_build
,
status:
:failed
,
commit:
commit
,
user:
user
)
}
let
(
:build
)
{
FactoryGirl
.
create
(
:ci_build
,
status:
'failed'
,
commit:
commit
,
user:
user
)
}
before
do
before
do
allow
(
mail
).
to
receive_messages
(
allow
(
mail
).
to
receive_messages
(
...
@@ -167,7 +167,7 @@ describe Ci::MailService do
...
@@ -167,7 +167,7 @@ describe Ci::MailService do
end
end
let
(
:gl_project
)
{
FactoryGirl
.
create
(
:empty_project
,
gitlab_ci_project:
project
)
}
let
(
:gl_project
)
{
FactoryGirl
.
create
(
:empty_project
,
gitlab_ci_project:
project
)
}
let
(
:commit
)
{
FactoryGirl
.
create
(
:ci_commit
,
gl_project:
gl_project
)
}
let
(
:commit
)
{
FactoryGirl
.
create
(
:ci_commit
,
gl_project:
gl_project
)
}
let
(
:build
)
{
FactoryGirl
.
create
(
:ci_build
,
status:
:failed
,
commit:
commit
,
user:
user
)
}
let
(
:build
)
{
FactoryGirl
.
create
(
:ci_build
,
status:
'failed'
,
commit:
commit
,
user:
user
)
}
before
do
before
do
allow
(
mail
).
to
receive_messages
(
allow
(
mail
).
to
receive_messages
(
...
...
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