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
c422ccb1
Commit
c422ccb1
authored
Feb 06, 2018
by
Ian Baum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict with app/models/ci/job_artificat.rb
parent
0c1b7ea6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
9 deletions
+0
-9
app/models/ci/job_artifact.rb
app/models/ci/job_artifact.rb
+0
-9
No files found.
app/models/ci/job_artifact.rb
View file @
c422ccb1
...
...
@@ -11,15 +11,6 @@ module Ci
mount_uploader
:file
,
JobArtifactUploader
<<<<<<<
HEAD
after_save
if: :file_changed?
,
on:
[
:create
,
:update
]
do
run_after_commit
do
file
.
schedule_migration_to_object_storage
end
end
=======
>>>>>>>
upstream
/
master
delegate
:open
,
:exists?
,
to: :file
enum
file_type:
{
...
...
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