Skip to content
Snippets Groups Projects
Verified Commit 3d416f16 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Create activity event and execute hooks on web editor commit

parent 2c403dfd
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -13,5 +13,11 @@ 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
Loading
Loading
@@ -40,7 +40,7 @@ module Files
params[:content]
end
 
created_successfully = repository.commit_file(
sha = repository.commit_file(
current_user,
file_path,
content,
Loading
Loading
@@ -49,7 +49,8 @@ module Files
)
 
 
if created_successfully
if sha
after_commit(sha)
success
else
error("Your changes could not be committed, because the file has been changed")
Loading
Loading
Loading
Loading
@@ -26,7 +26,7 @@ module Files
params[:content]
end
 
repository.commit_file(
sha = repository.commit_file(
current_user,
path,
content,
Loading
Loading
@@ -34,6 +34,7 @@ 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)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment