BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
dc4b3dd0
Commit
dc4b3dd0
authored
Dec 14, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix source_project and also pass source_project
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_19747556
parent
26af4b5a
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
2 deletions
+7
-2
creates_commit.rb
app/controllers/concerns/creates_commit.rb
+2
-2
change_service.rb
app/services/commits/change_service.rb
+1
-0
create_dir_service.rb
app/services/files/create_dir_service.rb
+1
-0
create_service.rb
app/services/files/create_service.rb
+1
-0
delete_service.rb
app/services/files/delete_service.rb
+1
-0
multi_service.rb
app/services/files/multi_service.rb
+1
-0
No files found.
app/controllers/concerns/creates_commit.rb
View file @
dc4b3dd0
...
...
@@ -6,12 +6,12 @@ module CreatesCommit
source_branch
=
@ref
if
@ref
&&
@repository
.
find_branch
(
@ref
)
commit_params
=
@commit_params
.
merge
(
source_project:
@project
,
source_project:
@
tree_edit_
project
,
source_branch:
source_branch
,
target_branch:
@target_branch
)
result
=
service
.
new
(
@
tree_edit_
project
,
current_user
,
commit_params
).
execute
result
=
service
.
new
(
@project
,
current_user
,
commit_params
).
execute
if
result
[
:status
]
==
:success
update_flash_notice
(
success_notice
)
...
...
app/services/commits/change_service.rb
View file @
dc4b3dd0
...
...
@@ -37,6 +37,7 @@ module Commits
@commit
,
into
,
tree_id
,
source_project:
@source_project
,
source_branch_name:
@target_branch
)
success
...
...
app/services/files/create_dir_service.rb
View file @
dc4b3dd0
...
...
@@ -8,6 +8,7 @@ module Files
branch_name:
@target_branch
,
author_email:
@author_email
,
author_name:
@author_name
,
source_project:
@source_project
,
source_branch_name:
@source_branch
)
end
...
...
app/services/files/create_service.rb
View file @
dc4b3dd0
...
...
@@ -10,6 +10,7 @@ module Files
update:
false
,
author_email:
@author_email
,
author_name:
@author_name
,
source_project:
@source_project
,
source_branch_name:
@source_branch
)
end
...
...
app/services/files/delete_service.rb
View file @
dc4b3dd0
...
...
@@ -8,6 +8,7 @@ module Files
branch_name:
@target_branch
,
author_email:
@author_email
,
author_name:
@author_name
,
source_project:
@source_project
,
source_branch_name:
@source_branch
)
end
end
...
...
app/services/files/multi_service.rb
View file @
dc4b3dd0
...
...
@@ -10,6 +10,7 @@ module Files
actions:
params
[
:actions
],
author_email:
@author_email
,
author_name:
@author_name
,
source_project:
@source_project
,
source_branch_name:
@source_branch
)
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