Commit 34975f01 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

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