diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-01 12:08:51 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-03-01 12:25:21 -0600 |
| commit | 80543e0abd65a575bcc43f2482279af3980f4acc (patch) | |
| tree | a9ca8ff8543f565bfd3a41a949f57ef39593b2b7 /app/controllers/concerns/creates_commit.rb | |
| parent | 981c730fdb3da1ada8d1b44d21e75a11175b3026 (diff) | |
| download | gitlab-ce-80543e0abd65a575bcc43f2482279af3980f4acc.tar.gz | |
Fix creating a file in an empty repo using the API
Diffstat (limited to 'app/controllers/concerns/creates_commit.rb')
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 2fe03020d2d..f897f828cec 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -4,7 +4,7 @@ module CreatesCommit def create_commit(service, success_path:, failure_path:, failure_view: nil, success_notice: nil) set_commit_variables - start_branch = @mr_target_branch unless initial_commit? + start_branch = @mr_target_branch commit_params = @commit_params.merge( start_project: @mr_target_project, start_branch: start_branch, @@ -117,11 +117,6 @@ module CreatesCommit @mr_source_branch = guess_mr_source_branch end - def initial_commit? - @mr_target_branch.nil? || - !@mr_target_project.repository.branch_exists?(@mr_target_branch) - end - def guess_mr_source_branch # XXX: Happens when viewing a commit without a branch. In this case, # @target_branch would be the default branch for @mr_source_project, |