Fix conflicts with app/models/ci/job_artifact.rb and app/uploaders/file_uploader.rb
# Conflicts: # app/models/ci/job_artifact.rb # app/uploaders/file_uploader.rb
Showing
This diff is collapsed.
Please register or sign in to comment