Commit c36418aa authored by Robert Speicher's avatar Robert Speicher Committed by Felipe Artur

Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master'

Fix creating a file in an empty repo using the API

Closes #28626

See merge request !9632
parent fb274568
...@@ -1075,6 +1075,8 @@ class Repository ...@@ -1075,6 +1075,8 @@ class Repository
end end
def with_repo_branch_commit(start_repository, start_branch_name) def with_repo_branch_commit(start_repository, start_branch_name)
return yield(nil) if start_repository.empty_repo?
branch_name_or_sha = branch_name_or_sha =
if start_repository == self if start_repository == self
start_branch_name start_branch_name
......
...@@ -58,16 +58,12 @@ module Files ...@@ -58,16 +58,12 @@ module Files
raise_error("You are not allowed to push into this branch") raise_error("You are not allowed to push into this branch")
end end
unless project.empty_repo? if !@start_project.empty_repo? && !@start_project.repository.branch_exists?(@start_branch)
unless @start_project.repository.branch_exists?(@start_branch) raise ValidationError, 'You can only create or edit files when you are on a branch'
raise_error('You can only create or edit files when you are on a branch')
end end
if different_branch? if !project.empty_repo? && different_branch? && repository.branch_exists?(@branch_name)
if repository.branch_exists?(@target_branch) raise ValidationError, "A branch called #{@branch_name} already exists. Switch to that branch in order to make changes"
raise_error('Branch with such name already exists. You need to switch to this branch in order to make changes')
end
end
end end
end end
......
...@@ -56,12 +56,16 @@ class GitOperationService ...@@ -56,12 +56,16 @@ class GitOperationService
start_project: repository.project, start_project: repository.project,
&block) &block)
check_with_branch_arguments!( start_repository = start_project.repository
branch_name, start_branch_name, start_project) start_branch_name = nil if start_repository.empty_repo?
if start_branch_name && !start_repository.branch_exists?(start_branch_name)
raise ArgumentError, "Cannot find branch #{start_branch_name} in #{start_repository.path_with_namespace}"
end
update_branch_with_hooks(branch_name) do update_branch_with_hooks(branch_name) do
repository.with_repo_branch_commit( repository.with_repo_branch_commit(
start_project.repository, start_repository,
start_branch_name || branch_name, start_branch_name || branch_name,
&block) &block)
end end
...@@ -149,31 +153,4 @@ class GitOperationService ...@@ -149,31 +153,4 @@ class GitOperationService
repository.raw_repository.autocrlf = :input repository.raw_repository.autocrlf = :input
end end
end end
def check_with_branch_arguments!(
branch_name, start_branch_name, start_project)
return if repository.branch_exists?(branch_name)
if repository.project != start_project
unless start_branch_name
raise ArgumentError,
'Should also pass :start_branch_name if' +
' :start_project is different from current project'
end
unless start_project.repository.branch_exists?(start_branch_name)
raise ArgumentError,
"Cannot find branch #{branch_name} nor" \
" #{start_branch_name} from" \
" #{start_project.path_with_namespace}"
end
elsif start_branch_name
unless repository.branch_exists?(start_branch_name)
raise ArgumentError,
"Cannot find branch #{branch_name} nor" \
" #{start_branch_name} from" \
" #{repository.project.path_with_namespace}"
end
end
end
end end
---
title: Fix creating a file in an empty repo using the API
merge_request: 9632
author:
...@@ -39,6 +39,10 @@ FactoryGirl.define do ...@@ -39,6 +39,10 @@ FactoryGirl.define do
trait :empty_repo do trait :empty_repo do
after(:create) do |project| after(:create) do |project|
project.create_repository project.create_repository
# We delete hooks so that gitlab-shell will not try to authenticate with
# an API that isn't running
FileUtils.rm_r(File.join(project.repository_storage_path, "#{project.path_with_namespace}.git", 'hooks'))
end end
end end
......
...@@ -147,6 +147,20 @@ describe API::Files, api: true do ...@@ -147,6 +147,20 @@ describe API::Files, api: true do
expect(last_commit.author_name).to eq(author_name) expect(last_commit.author_name).to eq(author_name)
end end
end end
context 'when the repo is empty' do
let!(:project) { create(:project_empty_repo, namespace: user.namespace ) }
it "creates a new file in project repo" do
post api("/projects/#{project.id}/repository/files", user), valid_params
expect(response).to have_http_status(201)
expect(json_response['file_path']).to eq('newfile.rb')
last_commit = project.repository.commit.raw
expect(last_commit.author_email).to eq(user.email)
expect(last_commit.author_name).to eq(user.name)
end
end
end end
describe "PUT /projects/:id/repository/files" do describe "PUT /projects/:id/repository/files" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment