Minor improve to UI and code formatting of gitlab web editor

app/assets/stylesheets/sections/tree.scss

@@ -59,3 +59,11 @@
     }
   }
 }
+
+.tree-btn-group {
+  .btn {
+    margin-right:-3px;
+    padding:2px 10px;
+  }
+}
+

app/controllers/tree_controller.rb

@@ -21,23 +21,23 @@ class TreeController < ProjectResourceController
   end
 
   def edit
-    @last_commit = @project.commits(@ref, @path, 1).first.sha
+    @last_commit = @project.last_commit_for(@ref, @path).sha
   end
 
   def update
     file_editor = Gitlab::FileEditor.new(current_user, @project, @ref)
     update_status = file_editor.update(
-      @path, 
-      params[:content], 
-      params[:commit_message], 
+      @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"
     else
       flash[:notice] = "You can't save file because it has been changed"
-      render :edit 
+      render :edit
     end
   end
 end

app/roles/repository.rb

@@ -32,6 +32,10 @@ module Repository
     Commit.commits(repo, ref, path, limit, offset)
   end
 
+  def last_commit_for(ref, path = nil)
+    commits(ref, path, 1).first
+  end
+
   def commits_between(from, to)
     Commit.commits_between(repo, from, to)
   end

app/views/tree/_tree_file.html.haml

@@ -5,10 +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"
-      = link_to "Edit", edit_project_tree_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

app/views/tree/edit.html.haml

@@ -3,7 +3,10 @@
     .file_holder
       .file_title
         %i.icon-file
-        = @tree.path.force_encoding('utf-8')
+        %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