Commit 42bdfd02 authored by Valeriy Sizov's avatar Valeriy Sizov

WebEditor: base implementation

parent 0b3e9fd2
...@@ -26,8 +26,14 @@ class TreeController < ProjectResourceController ...@@ -26,8 +26,14 @@ class TreeController < ProjectResourceController
def update def update
file_editor = Gitlab::FileEditor.new(current_user, @project, @ref) file_editor = Gitlab::FileEditor.new(current_user, @project, @ref)
if file_editor.can_edit?(@path, params[:last_commit]) update_status = file_editor.update(
file_editor.update(@path, params[:content]) @path,
params[:content],
params[:commit_message],
params[:last_commit]
)
if update_status
redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed" redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed"
else else
flash[:notice] = "You can't save file because it has been changed" flash[:notice] = "You can't save file because it has been changed"
......
...@@ -13,10 +13,15 @@ ...@@ -13,10 +13,15 @@
= text_area_tag 'commit_message' = text_area_tag 'commit_message'
.form-actions .form-actions
= hidden_field_tag 'last_commit', @last_commit = hidden_field_tag 'last_commit', @last_commit
= hidden_field_tag 'content' = hidden_field_tag 'content', '', :id => :file_content
= submit_tag "Save", class: 'btn save-btn' = button_tag "Save", class: 'btn save-btn'
:javascript :javascript
var editor = ace.edit("editor"); var editor = ace.edit("editor");
editor.setTheme("ace/theme/twilight"); editor.setTheme("ace/theme/twilight");
editor.getSession().setMode("ace/mode/javascript"); editor.getSession().setMode("ace/mode/javascript");
$(".save-btn").click(function(){
$("#file_content").val(editor.getValue());
$(".form_editor form").submit();
});
...@@ -9,13 +9,47 @@ module Gitlab ...@@ -9,13 +9,47 @@ module Gitlab
self.ref = ref self.ref = ref
end end
def can_edit?(path, last_commit) def update(path, content, commit_message, last_commit)
current_last_commit = @project.commits(ref, path, 1).first.sha return false unless can_edit?(path, last_commit)
last_commit == current_last_commit
Grit::Git.with_timeout(10.seconds) do
lock_file = Rails.root.join("tmp", "#{project.path}.lock")
File.open(lock_file, "w+") do |f|
f.flock(File::LOCK_EX)
unless project.satellite.exists?
raise "Satellite doesn't exist"
end
project.satellite.clear
Dir.chdir(project.satellite.path) do
r = Grit::Repo.new('.')
r.git.sh "git reset --hard"
r.git.sh "git fetch origin"
r.git.sh "git config user.name \"#{user.name}\""
r.git.sh "git config user.email \"#{user.email}\""
r.git.sh "git checkout -b #{ref} origin/#{ref}"
File.open(path, 'w'){|f| f.write(content)}
r.git.sh "git add ."
r.git.sh "git commit -am '#{commit_message}'"
output = r.git.sh "git push origin #{ref}"
if output =~ /reject/
return false
end
end
end
end end
def update(path, content)
true true
end
protected
def can_edit?(path, last_commit)
current_last_commit = @project.commits(ref, path, 1).first.sha
last_commit == current_last_commit
end end
end end
......
...@@ -28,13 +28,13 @@ module Gitlab ...@@ -28,13 +28,13 @@ module Gitlab
def process def process
Grit::Git.with_timeout(30.seconds) do Grit::Git.with_timeout(30.seconds) do
lock_file = Rails.root.join("tmp", "merge_repo_#{project.path}.lock") lock_file = Rails.root.join("tmp", "#{project.path}.lock")
File.open(lock_file, "w+") do |f| File.open(lock_file, "w+") do |f|
f.flock(File::LOCK_EX) f.flock(File::LOCK_EX)
unless project.satellite.exists? unless project.satellite.exists?
raise "You should run: rake gitlab:app:enable_automerge" raise "Satellite doesn't exist"
end end
project.satellite.clear project.satellite.clear
......
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