Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
edcff6ab158e
Commit
6827e068
authored
Nov 28, 2017
by
Zeger-Jan van de Weg
Committed by
Kamil Trzcinski
Dec 03, 2017
Browse files
Remove hook set by carrierwave too
parent
fdce8c8cb40f
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/models/ci/job_artifact.rb
View file @
edcff6ab
...
...
@@ -6,7 +6,6 @@ class JobArtifact < ActiveRecord::Base
belongs_to
:job
,
class_name:
"Ci::Build"
,
foreign_key: :job_id
before_save
:set_size
,
if: :file_changed?
after_commit
:remove_file!
,
on: :destroy
mount_uploader
:file
,
JobArtifactUploader
...
...
spec/models/ci/build_spec.rb
View file @
edcff6ab
...
...
@@ -1018,9 +1018,9 @@
describe
'#merge_request'
do
def
create_mr
(
build
,
pipeline
,
factory: :merge_request
,
created_at:
Time
.
now
)
create
(
factory
,
source_project:
pipeline
.
project
,
target_project:
pipeline
.
project
,
source_branch:
build
.
ref
,
created_at:
created_at
)
target_project:
pipeline
.
project
,
source_branch:
build
.
ref
,
created_at:
created_at
)
end
context
'when a MR has a reference to the pipeline'
do
...
...
@@ -1319,7 +1319,7 @@ def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
context
'when `when` is undefined'
do
before
do
build
.
when
=
nil
end
end
context
'use from gitlab-ci.yml'
do
let
(
:pipeline
)
{
create
(
:ci_pipeline
)
}
...
...
@@ -1360,7 +1360,7 @@ def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
end
end
end
end
end
describe
'#variables'
do
let
(
:container_registry_enabled
)
{
false
}
...
...
@@ -1463,7 +1463,7 @@ def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
before
do
environment_variables
<<
{
key:
'CI_ENVIRONMENT_URL'
,
value:
url
,
public:
true
}
{
key:
'CI_ENVIRONMENT_URL'
,
value:
url
,
public:
true
}
end
context
'when the URL was set from the job'
do
...
...
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