Commit f22f7a6f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets Committed by Valery Sizov

Revert "Create activity event and execute hooks on web editor commit"

This reverts commit 3d416f16.
parent fac581b1
......@@ -13,11 +13,5 @@ module Files
def repository
project.repository
end
def after_commit(sha)
commit = repository.commit(sha)
full_ref = 'refs/heads/' + (params[:new_branch] || ref)
GitPushService.new.execute(project, current_user, commit.parent_id, sha, full_ref)
end
end
end
......@@ -40,7 +40,7 @@ module Files
params[:content]
end
sha = repository.commit_file(
created_successfully = repository.commit_file(
current_user,
file_path,
content,
......@@ -49,8 +49,7 @@ module Files
)
if sha
after_commit(sha)
if created_successfully
success
else
error("Your changes could not be committed, because the file has been changed")
......
......@@ -26,7 +26,7 @@ module Files
params[:content]
end
sha = repository.commit_file(
repository.commit_file(
current_user,
path,
content,
......@@ -34,7 +34,6 @@ module Files
params[:new_branch] || ref
)
after_commit(sha)
success
rescue Gitlab::Satellite::CheckoutFailed => ex
error("Your changes could not be committed because ref '#{ref}' could not be checked out", 400)
......
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