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
dda472be
Commit
dda472be
authored
Feb 24, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec
parent
c6301fb0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
82 deletions
+26
-82
app/models/repository.rb
app/models/repository.rb
+21
-77
app/services/files/create_service.rb
app/services/files/create_service.rb
+1
-1
app/services/files/multi_service.rb
app/services/files/multi_service.rb
+3
-3
app/services/files/update_service.rb
app/services/files/update_service.rb
+1
-1
No files found.
app/models/repository.rb
View file @
dda472be
...
...
@@ -762,99 +762,43 @@ class Repository
@tags
||=
raw_repository
.
tags
end
# rubocop:disable Metrics/ParameterLists
def
create_dir
(
user
,
path
,
message
:,
branch_name
:,
author_email:
nil
,
author_name:
nil
,
start_branch_name:
nil
,
start_project:
project
)
def
create_dir
(
user
,
path
,
**
options
)
options
[
:user
]
=
user
options
[
:actions
]
=
[{
action: :create_dir
,
file_path:
path
}]
multi_action
(
user:
user
,
message:
message
,
branch_name:
branch_name
,
author_email:
author_email
,
author_name:
author_name
,
start_branch_name:
start_branch_name
,
start_project:
start_project
,
actions:
[{
action: :create_dir
,
file_path:
path
}])
multi_action
(
**
options
)
end
# rubocop:enable Metrics/ParameterLists
# rubocop:disable Metrics/ParameterLists
def
create_file
(
user
,
path
,
content
,
message
:,
branch_name
:,
author_email:
nil
,
author_name:
nil
,
start_branch_name:
nil
,
start_project:
project
)
def
create_file
(
user
,
path
,
content
,
**
options
)
options
[
:user
]
=
user
options
[
:actions
]
=
[{
action: :create
,
file_path:
path
,
content:
content
}]
multi_action
(
user:
user
,
message:
message
,
branch_name:
branch_name
,
author_email:
author_email
,
author_name:
author_name
,
start_branch_name:
start_branch_name
,
start_project:
start_project
,
actions:
[{
action: :create
,
file_path:
path
,
content:
content
}])
multi_action
(
**
options
)
end
# rubocop:enable Metrics/ParameterLists
# rubocop:disable Metrics/ParameterLists
def
update_file
(
user
,
path
,
content
,
message
:,
branch_name
:,
previous_path:
nil
,
author_email:
nil
,
author_name:
nil
,
start_branch_name:
nil
,
start_project:
project
)
action
=
if
previous_path
&&
previous_path
!=
path
:move
else
:update
end
multi_action
(
user:
user
,
message:
message
,
branch_name:
branch_name
,
author_email:
author_email
,
author_name:
author_name
,
start_branch_name:
start_branch_name
,
start_project:
start_project
,
actions:
[{
action:
action
,
file_path:
path
,
content:
content
,
previous_path:
previous_path
}])
def
update_file
(
user
,
path
,
content
,
**
options
)
previous_path
=
options
.
delete
(
:previous_path
)
action
=
previous_path
&&
previous_path
!=
path
?
:move
:
:update
options
[
:user
]
=
user
options
[
:actions
]
=
[{
action:
action
,
file_path:
path
,
previous_path:
previous_path
,
content:
content
}]
multi_action
(
**
options
)
end
# rubocop:enable Metrics/ParameterLists
# rubocop:disable Metrics/ParameterLists
def
delete_file
(
user
,
path
,
message
:,
branch_name
:,
author_email:
nil
,
author_name:
nil
,
start_branch_name:
nil
,
start_project:
project
)
def
delete_file
(
user
,
path
,
**
options
)
options
[
:user
]
=
user
options
[
:actions
]
=
[{
action: :delete
,
file_path:
path
}]
multi_action
(
user:
user
,
message:
message
,
branch_name:
branch_name
,
author_email:
author_email
,
author_name:
author_name
,
start_branch_name:
start_branch_name
,
start_project:
start_project
,
actions:
[{
action: :delete
,
file_path:
path
}])
multi_action
(
**
options
)
end
# rubocop:enable Metrics/ParameterLists
# rubocop:disable Metrics/ParameterLists
def
multi_action
(
user
:,
branch_name
:,
message
:,
actions
:,
author_email:
nil
,
author_name:
nil
,
start_branch_name:
nil
,
start_project:
project
)
GitOperationService
.
new
(
user
,
self
).
with_branch
(
branch_name
,
start_branch_name:
start_branch_name
,
...
...
app/services/files/create_service.rb
View file @
dda472be
...
...
@@ -16,7 +16,7 @@ module Files
def
validate
super
if
@file_content
.
empty
?
if
@file_content
.
nil
?
raise_error
(
"You must provide content."
)
end
...
...
app/services/files/multi_service.rb
View file @
dda472be
...
...
@@ -21,7 +21,7 @@ module Files
def
validate
super
params
[
:actions
].
each_with_index
do
|
action
,
index
|
if
ACTIONS
.
include?
(
action
[
:action
].
to_s
)
action
[
:action
]
=
action
[
:action
].
to_sym
...
...
@@ -102,13 +102,13 @@ module Files
raise_error
(
"Your changes could not be committed because a file with the name `
#{
action
[
:file_path
]
}
` already exists."
)
end
if
action
[
:content
].
empty
?
if
action
[
:content
].
nil
?
raise_error
(
"You must provide content."
)
end
end
def
validate_update
(
action
)
if
action
[
:content
].
empty
?
if
action
[
:content
].
nil
?
raise_error
(
"You must provide content."
)
end
...
...
app/services/files/update_service.rb
View file @
dda472be
...
...
@@ -18,7 +18,7 @@ module Files
def
validate
super
if
@file_content
.
empty
?
if
@file_content
.
nil
?
raise_error
(
"You must provide content."
)
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