Skip to content

Commit

Permalink
Remove save_file_only
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Gehrke committed Aug 10, 2016
1 parent 84359bb commit c7a91f9
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
10 changes: 0 additions & 10 deletions app/models/repository/git.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,6 @@ def save_file(tmp_file, filepath, message, user, do_parse: true)
version
end

def save_file_only(tmp_file, filepath, message, user)
commit = nil
git.add_file(user_info(user), tmp_file, filepath, message) do |commit_oid|
commit = commit_oid
end
commit_for!(commit, user)
touch
commit
end

def commit_for!(commit_oid, pusher)
instance = Commit.where(repository_id: self,
commit_oid: commit_oid,
Expand Down
2 changes: 1 addition & 1 deletion features/step_definitions/ontology_versions_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
repository = @ontology.repository
user = repository.permissions.first.subject
Tempfile.create('testfile') do |f|
repository.save_file_only(f.path, @ontology.path, 'add ontology file', user)
repository.save_file(f.path, @ontology.path, 'add ontology file', user, do_parse: false)
end
end

Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/files_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
tmpfile.write('unchanged')
tmpfile.close

repository.save_file_only(tmpfile, filepath, message, user)
repository.save_file(tmpfile, filepath, message, user, do_parse: false)
end

context "without validation error" do
Expand Down Expand Up @@ -159,7 +159,7 @@
tmpfile.write('unchanged')
tmpfile.close

repository.save_file_only(tmpfile, filepath, message, user)
repository.save_file(tmpfile, filepath, message, user, do_parse: false)
end

before do
Expand Down
2 changes: 1 addition & 1 deletion spec/models/repository_directory_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

let(:save_operation) do
file = Tempfile.new('tempfile').path
repository.save_file_only(file, filepath, 'message', user)
repository.save_file(file, filepath, 'message', user, do_parse: false)
end

it 'should add a commit' do
Expand Down

0 comments on commit c7a91f9

Please sign in to comment.