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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
05d742a0
Commit
05d742a0
authored
Jan 05, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Indent the way rubocop likes
parent
ecac2f11
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/controllers/concerns/creates_commit.rb
app/controllers/concerns/creates_commit.rb
+2
-2
app/models/repository.rb
app/models/repository.rb
+1
-1
app/services/git_operation_service.rb
app/services/git_operation_service.rb
+2
-2
No files found.
app/controllers/concerns/creates_commit.rb
View file @
05d742a0
...
...
@@ -4,8 +4,8 @@ module CreatesCommit
def
create_commit
(
service
,
success_path
:,
failure_path
:,
failure_view:
nil
,
success_notice:
nil
)
set_commit_variables
source_branch
=
@ref
if
@ref
&&
@mr_source_project
.
repository
.
branch_exists?
(
@ref
)
source_branch
=
@ref
if
@ref
&&
@mr_source_project
.
repository
.
branch_exists?
(
@ref
)
commit_params
=
@commit_params
.
merge
(
source_project:
@mr_source_project
,
source_branch:
source_branch
,
...
...
app/models/repository.rb
View file @
05d742a0
...
...
@@ -781,7 +781,7 @@ class Repository
end
if
source_branch_name
&&
source_project
.
repository
.
tree_entry_at
(
source_branch_name
,
path
)
source_project
.
repository
.
tree_entry_at
(
source_branch_name
,
path
)
raise
Gitlab
::
Git
::
Repository
::
InvalidBlobName
.
new
(
error_message
)
end
end
...
...
app/services/git_operation_service.rb
View file @
05d742a0
...
...
@@ -90,8 +90,8 @@ class GitOperationService
# If repo was empty expire cache
repository
.
after_create
if
was_empty
repository
.
after_create_branch
if
was_empty
||
Gitlab
::
Git
.
blank_ref?
(
oldrev
)
repository
.
after_create_branch
if
was_empty
||
Gitlab
::
Git
.
blank_ref?
(
oldrev
)
newrev
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