Merge branch 'feature/edit_from_mr'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG

CHANGELOG

 v 6.7.0
   - Add support for Gemnasium as a Project Service
+  - Add edit file button to MergeRequest diff
 
 v 6.6.0
   - Retrieving user ssh keys publically(github style): http://__HOST__/__USERNAME__.keys

app/assets/stylesheets/sections/commits.scss

@@ -27,10 +27,14 @@
       line-height: 2;
     }
 
-    .view-file {
-      font-weight: bold;
+    .diff-btn-group {
       float: right;
+
+      .btn {
         background-color: #EEE;
+        color: #666;
+        font-weight: bolder;
+      }
     }
 
     .commit-short-id {

app/controllers/projects/edit_tree_controller.rb

@@ -12,7 +12,16 @@ class Projects::EditTreeController < Projects::BaseTreeController
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
+
+      # If blob edit was initiated from merge request page
+      from_merge_request = MergeRequest.find_by(id: params[:from_merge_request_id])
+
+      if from_merge_request
+        from_merge_request.reload_code
+        redirect_to diffs_project_merge_request_path(from_merge_request.target_project, from_merge_request)
+      else
         redirect_to project_blob_path(@project, @id)
+      end
     else
       flash[:alert] = result[:error]
       render :show

app/views/projects/commits/_diffs.html.haml

@@ -49,6 +49,7 @@
           - if diff.deleted_file
             %span= diff.old_path
 
+            .diff-btn-group
               - if @commit.parent_ids.present?
                 = link_to project_blob_path(project, tree_join(@commit.parent_id, diff.new_path)), { class: 'btn btn-small view-file' } do
                   View file @
@@ -58,10 +59,17 @@
             - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
               %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
 
+            .diff-btn-group
+              - if @merge_request && @merge_request.source_project
+                = link_to project_edit_tree_path(@merge_request.source_project, tree_join(@merge_request.source_branch, diff.new_path), from_merge_request_id: @merge_request.id), { class: 'btn btn-small' } do
+                  Edit
+                 
+
               = link_to project_blob_path(project, tree_join(@commit.id, diff.new_path)), { class: 'btn btn-small view-file' } do
                 View file @
                 %span.commit-short-id= @commit.short_id(6)
 
+
         .content
           -# Skipp all non non-supported blobs
           - next unless file.respond_to?('text?')

app/views/projects/edit_tree/show.html.haml

@@ -23,6 +23,7 @@
     .form-actions
       = hidden_field_tag 'last_commit', @last_commit
       = hidden_field_tag 'content', '', id: "file-content"
+      = hidden_field_tag 'from_merge_request_id', params[:from_merge_request_id]
       .commit-button-annotation
         = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary'
         .message