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
f8e93cbb
Commit
f8e93cbb
authored
Dec 06, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict in app/uploaders/legacy_artifact_uploader.rb
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
c58b661f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
26 deletions
+0
-26
app/uploaders/legacy_artifact_uploader.rb
app/uploaders/legacy_artifact_uploader.rb
+0
-26
No files found.
app/uploaders/legacy_artifact_uploader.rb
View file @
f8e93cbb
<<<<<<<
HEAD
class
LegacyArtifactUploader
<
ObjectStoreUploader
class
LegacyArtifactUploader
<
ObjectStoreUploader
storage_options
Gitlab
.
config
.
artifacts
storage_options
Gitlab
.
config
.
artifacts
=======
class
LegacyArtifactUploader
<
GitlabUploader
storage
:file
>>>>>>>
upstream
/
master
def
self
.
local_store_path
def
self
.
local_store_path
Gitlab
.
config
.
artifacts
.
path
Gitlab
.
config
.
artifacts
.
path
...
@@ -14,29 +9,8 @@ class LegacyArtifactUploader < GitlabUploader
...
@@ -14,29 +9,8 @@ class LegacyArtifactUploader < GitlabUploader
File
.
join
(
self
.
local_store_path
,
'tmp/uploads/'
)
File
.
join
(
self
.
local_store_path
,
'tmp/uploads/'
)
end
end
<<<<<<<
HEAD
private
private
=======
def
store_dir
default_local_path
end
def
cache_dir
File
.
join
(
self
.
class
.
local_store_path
,
'tmp/cache'
)
end
def
work_dir
File
.
join
(
self
.
class
.
local_store_path
,
'tmp/work'
)
end
private
def
default_local_path
File
.
join
(
self
.
class
.
local_store_path
,
default_path
)
end
>>>>>>>
upstream
/
master
def
default_path
def
default_path
File
.
join
(
model
.
created_at
.
utc
.
strftime
(
'%Y_%m'
),
model
.
project_id
.
to_s
,
model
.
id
.
to_s
)
File
.
join
(
model
.
created_at
.
utc
.
strftime
(
'%Y_%m'
),
model
.
project_id
.
to_s
,
model
.
id
.
to_s
)
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