2 files changed, 35 insertions, 3 deletions
diff --git a/app/views/tree/_tree_file.html.haml b/app/views/tree/_tree_file.html.haml
index 82aaed24bdc..5202126792a 100644
--- a/app/views/tree/_tree_file.html.haml
+++ b/app/views/tree/_tree_file.html.haml
@@ -5,9 +5,11 @@
       = tree_file.name.force_encoding('utf-8')
       %small #{tree_file.mode}
     %span.options
-      = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
-      = link_to "history", project_commits_path(@project, @id), class: "btn very_small"
-      = link_to "blame", project_blame_path(@project, @id), class: "btn very_small"
+      .btn-group.tree-btn-group
+        = link_to "raw", project_blob_path(@project, @id), class: "btn very_small", target: "_blank"
+        = link_to "history", project_commits_path(@project, @id), class: "btn very_small"
+        = link_to "blame", project_blame_path(@project, @id), class: "btn very_small"
+        = link_to "edit", edit_project_tree_path(@project, @id), class: "btn very_small"
   - if tree_file.text?
     - if gitlab_markdown?(tree_file.name)
       .file_content.wiki
diff --git a/app/views/tree/edit.html.haml b/app/views/tree/edit.html.haml
new file mode 100644
index 00000000000..b81373b5587
--- /dev/null
+++ b/app/views/tree/edit.html.haml
@@ -0,0 +1,30 @@
+.file-editor
+  = form_tag(project_tree_path(@project, @id), :method => :put) do
+    .file_holder
+      .file_title
+        %i.icon-file
+        %span.file_name
+          = @tree.path.force_encoding('utf-8')
+        %span.options
+          = link_to "cancel editing", project_tree_path(@project, @id), class: "btn very_small"
+      .file_content.code
+        #editor= @tree.data
+
+    .editor-commit-comment
+      = label_tag 'commit_message' do
+        %p.slead Commit message
+      = text_area_tag 'commit_message', '', :required => true
+    .form-actions
+      = hidden_field_tag 'last_commit', @last_commit
+      = hidden_field_tag 'content', '', :id => :file_content
+      = button_tag "Save", class: 'btn save-btn'
+
+:javascript
+  var editor = ace.edit("editor");
+  editor.setTheme("ace/theme/twilight");
+  editor.getSession().setMode("ace/mode/javascript");
+
+  $(".save-btn").click(function(){
+    $("#file_content").val(editor.getValue());
+    $(".form_editor form").submit();
+  });