From 3e259ea8bc198b7a5c67bd1e03dc9d44c7dd5854 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 11 Aug 2015 14:33:31 +0200
Subject: [PATCH 01/13] Revert "Merge branch 'revert-satellites' into 'master'
 "

This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing
changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
---
 CHANGELOG                                     |   4 +
 Gemfile.lock                                  |   2 +-
 .../merge_request_widget.js.coffee            |   8 +-
 .../stylesheets/pages/merge_requests.scss     | 148 ++++++++----------
 app/controllers/projects/blob_controller.rb   |  60 +++----
 .../projects/compare_controller.rb            |   9 +-
 .../projects/merge_requests_controller.rb     |  12 +-
 app/helpers/merge_requests_helper.rb          |  10 ++
 app/models/merge_request.rb                   |  55 ++++---
 app/models/merge_request_diff.rb              |  32 ++--
 app/models/namespace.rb                       |   5 +-
 app/models/project.rb                         |  14 +-
 .../project_services/gitlab_ci_service.rb     |   4 +
 app/models/repository.rb                      |  82 ++++++++++
 app/services/base_service.rb                  |   4 +
 app/services/compare_service.rb               |  41 ++---
 app/services/files/base_service.rb            |  77 ++++++++-
 app/services/files/create_service.rb          |  44 ++----
 app/services/files/delete_service.rb          |  33 +---
 app/services/files/update_service.rb          |  36 +----
 app/services/git_push_service.rb              |  13 +-
 .../merge_requests/auto_merge_service.rb      |  30 ----
 .../merge_requests/base_merge_service.rb      |  10 --
 app/services/merge_requests/build_service.rb  |  14 +-
 app/services/merge_requests/merge_service.rb  |  61 ++++++--
 .../merge_requests/post_merge_service.rb      |  22 +++
 .../merge_requests/refresh_service.rb         |   4 +-
 app/services/post_commit_service.rb           |  71 +++++++++
 app/services/projects/destroy_service.rb      |   1 -
 app/services/projects/transfer_service.rb     |   6 -
 app/views/projects/blob/_editor.html.haml     |   4 +-
 app/views/projects/blob/new.html.haml         |  11 +-
 .../merge_requests/_new_compare.html.haml     |   2 +-
 .../merge_requests/_new_submit.html.haml      |   4 +-
 .../projects/merge_requests/_show.html.haml   |  51 +++---
 .../{automerge.js.haml => merge.js.haml}      |   0
 .../merge_requests/show/_commits.html.haml    |   2 +-
 .../merge_requests/show/_diffs.html.haml      |   2 +-
 .../show/_how_to_merge.html.haml              |  55 ++++---
 .../merge_requests/widget/_closed.html.haml   |   5 +-
 .../merge_requests/widget/_heading.html.haml  |  47 ++----
 .../merge_requests/widget/_locked.html.haml   |   5 +-
 .../merge_requests/widget/_merged.html.haml   |  24 ++-
 .../merge_requests/widget/_open.html.haml     |   4 +-
 .../merge_requests/widget/_show.html.haml     |   4 +-
 .../widget/open/_accept.html.haml             |  14 +-
 .../widget/open/_archived.html.haml           |   4 +-
 .../widget/open/_check.html.haml              |   4 +-
 .../widget/open/_conflicts.html.haml          |  20 +--
 .../widget/open/_missing_branch.html.haml     |  32 ++--
 .../widget/open/_no_satellite.html.haml       |   3 -
 .../widget/open/_not_allowed.html.haml        |   6 +-
 .../widget/open/_nothing.html.haml            |  14 +-
 .../widget/open/_reload.html.haml             |   7 +-
 .../merge_requests/widget/open/_wip.html.haml |  16 +-
 app/views/shared/issuable/_form.html.haml     |   4 +-
 app/workers/auto_merge_worker.rb              |  13 --
 app/workers/merge_worker.rb                   |  19 +++
 app/workers/repository_import_worker.rb       |   1 -
 config/routes.rb                              |   4 +-
 doc/development/architecture.md               |   6 +-
 doc/install/installation.md                   |   4 -
 doc/install/requirements.md                   |   4 +-
 doc/install/structure.md                      |   4 +-
 doc/logs/logs.md                              |  12 +-
 doc/raketasks/maintenance.md                  |  13 --
 doc/workflow/README.md                        |   1 +
 doc/workflow/merge_requests.md                |  40 +++++
 features/steps/dashboard/help.rb              |   2 +-
 features/steps/dashboard/merge_requests.rb    |   8 +-
 .../steps/project/forked_merge_requests.rb    |   1 -
 features/steps/project/merge_requests.rb      |   5 -
 lib/api/files.rb                              |  50 +++---
 lib/api/merge_requests.rb                     |   6 +-
 lib/gitlab.rb                                 |   1 -
 lib/gitlab/backend/shell.rb                   |  14 --
 lib/gitlab/satellite/action.rb                |  58 -------
 lib/gitlab/satellite/compare_action.rb        |  44 ------
 .../satellite/files/delete_file_action.rb     |  50 ------
 .../satellite/files/edit_file_action.rb       |  68 --------
 lib/gitlab/satellite/files/file_action.rb     |  25 ---
 lib/gitlab/satellite/files/new_file_action.rb |  67 --------
 lib/gitlab/satellite/logger.rb                |  13 --
 lib/gitlab/satellite/merge_action.rb          | 146 -----------------
 lib/gitlab/satellite/satellite.rb             | 148 ------------------
 lib/tasks/gitlab/check.rake                   |  56 -------
 lib/tasks/gitlab/enable_automerge.rake        |  39 -----
 spec/lib/gitlab/reference_extractor_spec.rb   |   8 +-
 spec/lib/gitlab/satellite/action_spec.rb      | 116 --------------
 .../lib/gitlab/satellite/merge_action_spec.rb | 104 ------------
 spec/models/merge_request_spec.rb             |   2 +-
 .../project_services/slack_service_spec.rb    |   2 +-
 spec/models/project_spec.rb                   |   1 -
 spec/models/repository_spec.rb                |  14 ++
 spec/requests/api/files_spec.rb               |  40 +----
 spec/requests/api/merge_requests_spec.rb      |  26 ++-
 spec/routing/project_routing_spec.rb          |  14 +-
 .../merge_requests/create_service_spec.rb     |   2 +-
 .../merge_requests/merge_service_spec.rb      |   5 -
 spec/support/mentionable_shared_examples.rb   |   2 +-
 100 files changed, 844 insertions(+), 1670 deletions(-)
 delete mode 100644 app/services/merge_requests/auto_merge_service.rb
 delete mode 100644 app/services/merge_requests/base_merge_service.rb
 create mode 100644 app/services/merge_requests/post_merge_service.rb
 create mode 100644 app/services/post_commit_service.rb
 rename app/views/projects/merge_requests/{automerge.js.haml => merge.js.haml} (100%)
 delete mode 100644 app/views/projects/merge_requests/widget/open/_no_satellite.html.haml
 delete mode 100644 app/workers/auto_merge_worker.rb
 create mode 100644 app/workers/merge_worker.rb
 create mode 100644 doc/workflow/merge_requests.md
 delete mode 100644 lib/gitlab/satellite/action.rb
 delete mode 100644 lib/gitlab/satellite/compare_action.rb
 delete mode 100644 lib/gitlab/satellite/files/delete_file_action.rb
 delete mode 100644 lib/gitlab/satellite/files/edit_file_action.rb
 delete mode 100644 lib/gitlab/satellite/files/file_action.rb
 delete mode 100644 lib/gitlab/satellite/files/new_file_action.rb
 delete mode 100644 lib/gitlab/satellite/logger.rb
 delete mode 100644 lib/gitlab/satellite/merge_action.rb
 delete mode 100644 lib/gitlab/satellite/satellite.rb
 delete mode 100644 lib/tasks/gitlab/enable_automerge.rake
 delete mode 100644 spec/lib/gitlab/satellite/action_spec.rb
 delete mode 100644 spec/lib/gitlab/satellite/merge_action_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index c0a98522fd..8801cd6359 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,7 +45,10 @@ v 7.14.0 (unreleased)
   - Remove redis-store TTL monkey patch
   - Add support for CI skipped status
   - Fetch code from forks to refs/merge-requests/:id/head when merge request created
+  - Remove satellites
   - Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
+  - Improve MR merge widget text and UI consistency.
+  - Improve text in MR "How To Merge" modal.
   - Cache all events
   - Order commits by date when comparing branches
   - Fix bug causing error when the target branch of a symbolic ref was deleted
@@ -196,6 +199,7 @@ v 7.12.0
   - Add SAML support as an omniauth provider
   - Allow to configure a URL to show after sign out
   - Add an option to automatically sign-in with an Omniauth provider
+  - Better performance for web editor (switched from satellites to rugged)
   - GitLab CI service sends .gitlab-ci.yml in each push call
   - When remove project - move repository and schedule it removal
   - Improve group removing logic
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c3a8e763a..5ba6948cbc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -875,4 +875,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.10.5
+   1.10.4
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee
index 762eec63de..995a2f2409 100644
--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -19,7 +19,7 @@ class @MergeRequestWidget
           when 'merged'
             location.reload()
           else
-            setTimeout(merge_request_widget.mergeInProgress, 3000)
+            setTimeout(merge_request_widget.mergeInProgress, 2000)
       dataType: 'json'
 
   getMergeStatus: ->
@@ -49,10 +49,8 @@ class @MergeRequestWidget
       @setMergeButtonClass('btn-danger')
 
   showCiCoverage: (coverage) ->
-    cov_html = $('<span>')
-    cov_html.addClass('ci-coverage')
-    cov_html.text('Coverage ' + coverage + '%')
-    $('.ci_widget:visible').append(cov_html)
+    text = 'Coverage ' + coverage + '%'
+    $('.ci_widget:visible .ci-coverage').text(text)
 
   setMergeButtonClass: (css_class) ->
     $('.accept_merge_request').removeClass("btn-create").addClass(css_class)
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index baba6f3212..30bbec7b79 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -1,9 +1,15 @@
-
-  /**
-   * MR -> show: Automerge widget
+/**
+ * MR -> show: Automerge widget
  *
  */
 .mr-state-widget {
+  background: #FAFAFA;
+  margin-bottom: 20px;
+  color: #666;
+  border: 1px solid #e5e5e5;
+  @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
+  @include border-radius(3px);
+
   form {
     margin-bottom: 0;
     .clearfix {
@@ -20,16 +26,67 @@
       display: inline-block;
       margin: 0;
       margin-left: 20px;
-      padding: 10px 0;
+      padding: 5px;
       line-height: 20px;
-      font-weight: bold;
 
       .remove_source_checkbox {
         margin: 0;
-        font-weight: bold;
       }
     }
   }
+
+  .ci_widget {
+    border-bottom: 1px solid #EEE;
+
+    i {
+      margin-right: 4px;
+    }
+
+    &.ci-success {
+      color: $gl-success;
+    }
+
+    &.ci-skipped {
+      background-color: #eee;
+      color: #888;
+    }
+
+    &.ci-pending,
+    &.ci-running {
+      color: $gl-warning;
+    }
+
+    &.ci-failed,
+    &.ci-canceled,
+    &.ci-error {
+      color: $gl-danger;
+    }
+  }
+
+  .mr-widget-body,
+  .ci_widget,
+  .mr-widget-footer {
+    padding: 15px;
+  }
+
+  .mr-widget-body {
+    h4 {
+      font-weight: bold;
+      margin: 5px 0;
+    }
+
+    p:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .mr-widget-footer {
+    border-top: 1px solid #EEE;
+  }
+
+  .ci-coverage {
+    float: right;
+  }
 }
 
 @media(min-width: $screen-sm-max) {
@@ -61,23 +118,10 @@
 }
 
 .label-branch {
-  @include border-radius(4px);
-  padding: 3px 4px;
-  border: none;
-  background: $hover;
-  color: #333;
+  color: #222;
   font-family: $monospace_font;
-  font-weight: normal;
+  font-weight: bold;
   overflow: hidden;
-
-  .label-project {
-    @include border-radius-left(4px);
-    padding: 3px 4px;
-    background: #279;
-    position: relative;
-    left: -4px;
-    letter-spacing: -1px;
-  }
 }
 
 .mr-list {
@@ -124,64 +168,6 @@
   display: none;
 }
 
-.mr-state-widget {
-  font-size: 13px;
-  background: #FAFAFA;
-  margin-bottom: 20px;
-  color: #666;
-  border: 1px solid #e5e5e5;
-  @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
-  @include border-radius(3px);
-
-  .ci_widget {
-    padding: 10px 15px;
-    font-size: 15px;
-    border-bottom: 1px solid #EEE;
-
-    &.ci-success {
-      color: $gl-success;
-    }
-
-    &.ci-skipped {
-      background-color: #eee;
-      color: #888;
-    }
-
-    &.ci-pending,
-    &.ci-running {
-      color: $gl-warning;
-    }
-
-    &.ci-failed,
-    &.ci-canceled,
-    &.ci-error {
-      color: $gl-danger;
-    }
-  }
-
-  .mr-widget-body {
-    padding: 10px 15px;
-
-    h4 {
-      font-weight: bold;
-      margin: 5px 0;
-    }
-
-    p:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  .mr-widget-footer {
-    padding: 10px 15px;
-    border-top: 1px solid #EEE;
-  }
-
-  .ci-coverage {
-    float: right;
-  }
-}
-
 .merge-request-show-labels {
   a {
     margin-right: 5px;
@@ -196,3 +182,7 @@
 .merge-request-form .select2-container {
   width: 250px !important;
 }
+
+#modal_merge_info .modal-dialog {
+  width: 600px;
+}
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index b762518d37..100d3d3b31 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -13,27 +13,20 @@ class Projects::BlobController < Projects::ApplicationController
   before_action :commit, except: [:new, :create]
   before_action :blob, except: [:new, :create]
   before_action :from_merge_request, only: [:edit, :update]
-  before_action :after_edit_path, only: [:edit, :update]
   before_action :require_branch_head, only: [:edit, :update]
+  before_action :editor_variables, except: [:show, :preview, :diff]
+  before_action :after_edit_path, only: [:edit, :update]
 
   def new
     commit unless @repository.empty?
   end
 
   def create
-    file_path = File.join(@path, File.basename(params[:file_name]))
-    result = Files::CreateService.new(
-      @project,
-      current_user,
-      params.merge(new_branch: sanitized_new_branch_name),
-      @ref,
-      file_path
-    ).execute
+    result = Files::CreateService.new(@project, current_user, @commit_params).execute
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
-      ref = sanitized_new_branch_name.presence || @ref
-      redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(ref, file_path))
+      redirect_to namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @file_path))
     else
       flash[:alert] = result[:message]
       render :new
@@ -48,22 +41,10 @@ class Projects::BlobController < Projects::ApplicationController
   end
 
   def update
-    result = Files::UpdateService.
-      new(
-        @project,
-        current_user,
-        params.merge(new_branch: sanitized_new_branch_name),
-        @ref,
-        @path
-      ).execute
+    result = Files::UpdateService.new(@project, current_user, @commit_params).execute
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
-
-      if from_merge_request
-        from_merge_request.reload_code
-      end
-
       redirect_to after_edit_path
     else
       flash[:alert] = result[:message]
@@ -80,12 +61,11 @@ class Projects::BlobController < Projects::ApplicationController
   end
 
   def destroy
-    result = Files::DeleteService.new(@project, current_user, params, @ref, @path).execute
+    result = Files::DeleteService.new(@project, current_user, @commit_params).execute
 
     if result[:status] == :success
       flash[:notice] = "Your changes have been successfully committed"
-      redirect_to namespace_project_tree_path(@project.namespace, @project,
-                                              @ref)
+      redirect_to namespace_project_tree_path(@project.namespace, @project, @target_branch)
     else
       flash[:alert] = result[:message]
       render :show
@@ -135,7 +115,6 @@ class Projects::BlobController < Projects::ApplicationController
     @id = params[:id]
     @ref, @path = extract_ref(@id)
 
-
   rescue InvalidPathError
     not_found!
   end
@@ -145,8 +124,8 @@ class Projects::BlobController < Projects::ApplicationController
       if from_merge_request
         diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
           "#file-path-#{hexdigest(@path)}"
-      elsif sanitized_new_branch_name.present?
-        namespace_project_blob_path(@project.namespace, @project, File.join(sanitized_new_branch_name, @path))
+      elsif @target_branch.present?
+        namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path))
       else
         namespace_project_blob_path(@project.namespace, @project, @id)
       end
@@ -160,4 +139,25 @@ class Projects::BlobController < Projects::ApplicationController
   def sanitized_new_branch_name
     @new_branch ||= sanitize(strip_tags(params[:new_branch]))
   end
+
+  def editor_variables
+    @current_branch = @ref
+    @target_branch = (sanitized_new_branch_name || @ref)
+
+    @file_path =
+      if action_name.to_s == 'create'
+        File.join(@path, File.basename(params[:file_name]))
+      else
+        @path
+      end
+
+    @commit_params = {
+      file_path: @file_path,
+      current_branch: @current_branch,
+      target_branch: @target_branch,
+      commit_message: params[:commit_message],
+      file_content: params[:content],
+      file_content_encoding: params[:encoding]
+    }
+  end
 end
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index c5f085c236..d9b3adae95 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -13,13 +13,8 @@ class Projects::CompareController < Projects::ApplicationController
     base_ref = Addressable::URI.unescape(params[:from])
     @ref = head_ref = Addressable::URI.unescape(params[:to])
 
-    compare_result = CompareService.new.execute(
-      current_user,
-      @project,
-      head_ref,
-      @project,
-      base_ref
-    )
+    compare_result = CompareService.new.
+      execute(@project, head_ref, @project, base_ref)
 
     @commits = compare_result.commits
     @diffs = compare_result.diffs
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index d126519831..f3054881da 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -1,9 +1,7 @@
-require 'gitlab/satellite/satellite'
-
 class Projects::MergeRequestsController < Projects::ApplicationController
   before_action :module_enabled
   before_action :merge_request, only: [
-    :edit, :update, :show, :diffs, :commits, :automerge, :automerge_check,
+    :edit, :update, :show, :diffs, :commits, :merge, :merge_check,
     :ci_status, :toggle_subscription
   ]
   before_action :closes_issues, only: [:edit, :update, :show, :diffs, :commits]
@@ -137,7 +135,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     end
   end
 
-  def automerge_check
+  def merge_check
     if @merge_request.unchecked?
       @merge_request.check_if_can_be_merged
     end
@@ -147,11 +145,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     render partial: "projects/merge_requests/widget/show.html.haml", layout: false
   end
 
-  def automerge
+  def merge
     return access_denied! unless @merge_request.can_be_merged_by?(current_user)
 
-    if @merge_request.automergeable?
-      AutoMergeWorker.perform_async(@merge_request.id, current_user.id, params)
+    if @merge_request.mergeable?
+      MergeWorker.perform_async(@merge_request.id, current_user.id, params)
       @status = true
     else
       @status = false
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 45ee4fe413..f8169b4f28 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -61,4 +61,14 @@ module MergeRequestsHelper
       }
     )
   end
+
+  def source_branch_with_namespace(merge_request)
+    if merge_request.for_fork?
+      namespace = link_to(merge_request.source_project_namespace,
+        project_path(merge_request.source_project))
+      namespace + ":#{merge_request.source_branch}"
+    else
+      merge_request.source_branch
+    end
+  end
 end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 324d1795ab..467b90861f 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -41,8 +41,6 @@ class MergeRequest < ActiveRecord::Base
 
   delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil
 
-  attr_accessor :should_remove_source_branch
-
   # When this attribute is true some MR validation is ignored
   # It allows us to close or modify broken merge requests
   attr_accessor :allow_broken
@@ -57,7 +55,7 @@ class MergeRequest < ActiveRecord::Base
       transition [:reopened, :opened] => :closed
     end
 
-    event :merge do
+    event :mark_as_merged do
       transition [:reopened, :opened, :locked] => :merged
     end
 
@@ -205,7 +203,10 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def check_if_can_be_merged
-    if Gitlab::Satellite::MergeAction.new(self.author, self).can_be_merged?
+    can_be_merged =
+      project.repository.can_be_merged?(source_sha, target_branch)
+
+    if can_be_merged
       mark_as_mergeable
     else
       mark_as_unmergeable
@@ -220,18 +221,6 @@ class MergeRequest < ActiveRecord::Base
     self.target_project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
   end
 
-  def automerge!(current_user, commit_message = nil)
-    return unless automergeable?
-
-    MergeRequests::AutoMergeService.
-      new(target_project, current_user).
-      execute(self, commit_message)
-  end
-
-  def remove_source_branch?
-    self.should_remove_source_branch && !self.source_project.root_ref?(self.source_branch) && !self.for_fork?
-  end
-
   def open?
     opened? || reopened?
   end
@@ -240,11 +229,11 @@ class MergeRequest < ActiveRecord::Base
     title =~ /\A\[?WIP\]?:? /i
   end
 
-  def automergeable?
+  def mergeable?
     open? && !work_in_progress? && can_be_merged?
   end
 
-  def automerge_status
+  def gitlab_merge_status
     if work_in_progress?
       "work_in_progress"
     else
@@ -271,14 +260,14 @@ class MergeRequest < ActiveRecord::Base
   #
   # see "git diff"
   def to_diff(current_user)
-    Gitlab::Satellite::MergeAction.new(current_user, self).diff_in_satellite
+    target_project.repository.diff_text(target_branch, source_sha)
   end
 
   # Returns the commit as a series of email patches.
   #
   # see "git format-patch"
   def to_patch(current_user)
-    Gitlab::Satellite::MergeAction.new(current_user, self).format_patch
+    target_project.repository.format_patch(target_branch, source_sha)
   end
 
   def hook_attrs
@@ -429,4 +418,30 @@ class MergeRequest < ActiveRecord::Base
       "Open"
     end
   end
+
+  def target_sha
+    @target_sha ||= target_project.
+      repository.commit(target_branch).sha
+  end
+
+  def source_sha
+    commits.first.sha
+  end
+
+  def fetch_ref
+    target_project.repository.fetch_ref(
+      source_project.repository.path_to_repo,
+      "refs/heads/#{source_branch}",
+      "refs/merge-requests/#{iid}/head"
+    )
+  end
+
+  def in_locked_state
+    begin
+      lock_mr
+      yield
+    ensure
+      unlock_mr if locked?
+    end
+  end
 end
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index df1c2b7875..e317c8eac4 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -16,9 +16,8 @@ require Rails.root.join("app/models/commit")
 class MergeRequestDiff < ActiveRecord::Base
   include Sortable
 
-  # Prevent store of diff
-  # if commits amount more then 200
-  COMMITS_SAFE_SIZE = 200
+  # Prevent store of diff if commits amount more then 500
+  COMMITS_SAFE_SIZE = 500
 
   attr_reader :commits, :diffs
 
@@ -124,12 +123,12 @@ class MergeRequestDiff < ActiveRecord::Base
     if new_diffs.any?
       if new_diffs.size > Commit::DIFF_HARD_LIMIT_FILES
         self.state = :overflow_diff_files_limit
-        new_diffs = []
+        new_diffs = new_diffs.first[Commit::DIFF_HARD_LIMIT_LINES]
       end
 
       if new_diffs.sum { |diff| diff.diff.lines.count } > Commit::DIFF_HARD_LIMIT_LINES
         self.state = :overflow_diff_lines_limit
-        new_diffs = []
+        new_diffs = new_diffs.first[Commit::DIFF_HARD_LIMIT_LINES]
       end
     end
 
@@ -160,12 +159,21 @@ class MergeRequestDiff < ActiveRecord::Base
   private
 
   def compare_result
-    @compare_result ||= CompareService.new.execute(
-      merge_request.author,
-      merge_request.source_project,
-      merge_request.source_branch,
-      merge_request.target_project,
-      merge_request.target_branch,
-    )
+    @compare_result ||=
+      begin
+        # Update ref for merge request
+        merge_request.fetch_ref
+
+        # Get latest sha of branch from source project
+        source_sha = merge_request.source_project.commit(source_branch).sha
+
+        Gitlab::CompareResult.new(
+          Gitlab::Git::Compare.new(
+            merge_request.target_project.repository.raw_repository,
+            merge_request.target_branch,
+            source_sha,
+          )
+        )
+      end
   end
 end
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 30ffacadde..161a16ca61 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -118,12 +118,11 @@ class Namespace < ActiveRecord::Base
     gitlab_shell.add_namespace(path_was)
 
     if gitlab_shell.mv_namespace(path_was, path)
-      # If repositories moved successfully we need to remove old satellites
-      # and send update instructions to users.
+      # If repositories moved successfully we need to
+      # send update instructions to users.
       # However we cannot allow rollback since we moved namespace dir
       # So we basically we mute exceptions in next actions
       begin
-        gitlab_shell.rm_satellites(path_was)
         send_update_instructions
       rescue
         # Returning false does not rollback after_* transaction but gives
diff --git a/app/models/project.rb b/app/models/project.rb
index 3dc1729e81..4628f478ca 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -520,14 +520,6 @@ class Project < ActiveRecord::Base
     !repository.exists? || repository.empty?
   end
 
-  def ensure_satellite_exists
-    self.satellite.create unless self.satellite.exists?
-  end
-
-  def satellite
-    @satellite ||= Gitlab::Satellite::Satellite.new(self)
-  end
-
   def repo
     repository.raw
   end
@@ -597,14 +589,11 @@ class Project < ActiveRecord::Base
     new_path_with_namespace = File.join(namespace_dir, path)
 
     if gitlab_shell.mv_repository(old_path_with_namespace, new_path_with_namespace)
-      # If repository moved successfully we need to remove old satellite
-      # and send update instructions to users.
+      # If repository moved successfully we need to send update instructions to users.
       # However we cannot allow rollback since we moved repository
       # So we basically we mute exceptions in next actions
       begin
         gitlab_shell.mv_repository("#{old_path_with_namespace}.wiki", "#{new_path_with_namespace}.wiki")
-        gitlab_shell.rm_satellites(old_path_with_namespace)
-        ensure_satellite_exists
         send_move_instructions
         reset_events_cache
       rescue
@@ -702,7 +691,6 @@ class Project < ActiveRecord::Base
   def create_repository
     if forked?
       if gitlab_shell.fork_repository(forked_from_project.path_with_namespace, self.namespace.path)
-        ensure_satellite_exists
         true
       else
         errors.add(:base, 'Failed to fork repository via gitlab-shell')
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index 5aaa4e85cb..ecdcd48ae6 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -74,6 +74,8 @@ class GitlabCiService < CiService
     else
       :error
     end
+  rescue Errno::ECONNREFUSED
+    :error
   end
 
   def fork_registration(new_project, private_token)
@@ -103,6 +105,8 @@ class GitlabCiService < CiService
     if response.code == 200 and response["coverage"]
       response["coverage"]
     end
+  rescue Errno::ECONNREFUSED
+    nil
   end
 
   def build_page(sha, ref)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 0a62980f93..46efbede2a 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -364,6 +364,83 @@ class Repository
     @root_ref ||= raw_repository.root_ref
   end
 
+  def commit_file(user, path, content, message, ref)
+    path[0] = '' if path[0] == '/'
+
+    committer = user_to_comitter(user)
+    options = {}
+    options[:committer] = committer
+    options[:author] = committer
+    options[:commit] = {
+      message: message,
+      branch: ref
+    }
+
+    options[:file] = {
+      content: content,
+      path: path
+    }
+
+    Gitlab::Git::Blob.commit(raw_repository, options)
+  end
+
+  def remove_file(user, path, message, ref)
+    path[0] = '' if path[0] == '/'
+
+    committer = user_to_comitter(user)
+    options = {}
+    options[:committer] = committer
+    options[:author] = committer
+    options[:commit] = {
+      message: message,
+      branch: ref
+    }
+
+    options[:file] = {
+      path: path
+    }
+
+    Gitlab::Git::Blob.remove(raw_repository, options)
+  end
+
+  def user_to_comitter(user)
+    {
+      email: user.email,
+      name: user.name,
+      time: Time.now
+    }
+  end
+
+  def can_be_merged?(source_sha, target_branch)
+    our_commit = rugged.branches[target_branch].target
+    their_commit = rugged.lookup(source_sha)
+
+    if our_commit && their_commit
+      !rugged.merge_commits(our_commit, their_commit).conflicts?
+    else
+      false
+    end
+  end
+
+  def merge(source_sha, target_branch, options = {})
+    our_commit = rugged.branches[target_branch].target
+    their_commit = rugged.lookup(source_sha)
+
+    raise "Invalid merge target" if our_commit.nil?
+    raise "Invalid merge source" if their_commit.nil?
+
+    merge_index = rugged.merge_commits(our_commit, their_commit)
+    return false if merge_index.conflicts?
+
+    actual_options = options.merge(
+      parents: [our_commit, their_commit],
+      tree: merge_index.write_tree(rugged),
+      update_ref: "refs/heads/#{target_branch}"
+    )
+
+    Rugged::Commit.create(rugged, actual_options)
+  end
+
   def search_files(query, ref)
     offset = 2
     args = %W(git grep -i -n --before-context #{offset} --after-context #{offset} #{query} #{ref || root_ref})
@@ -397,6 +474,11 @@ class Repository
     )
   end
 
+  def fetch_ref(source_path, source_ref, target_ref)
+    args = %W(git fetch #{source_path} #{source_ref}:#{target_ref})
+    Gitlab::Popen.popen(args, path_to_repo)
+  end
+
   private
 
   def cache
diff --git a/app/services/base_service.rb b/app/services/base_service.rb
index 6d9ed34591..f00ec7408b 100644
--- a/app/services/base_service.rb
+++ b/app/services/base_service.rb
@@ -31,6 +31,10 @@ class BaseService
     SystemHooksService.new
   end
 
+  def repository
+    project.repository
+  end
+
   # Add an error to the specified model for restricted visibility levels
   def deny_visibility_level(model, denied_visibility_level = nil)
     denied_visibility_level ||= model.visibility_level
diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb
index 6aa9df4b19..70f642baaa 100644
--- a/app/services/compare_service.rb
+++ b/app/services/compare_service.rb
@@ -1,27 +1,28 @@
+require 'securerandom'
+
 # Compare 2 branches for one repo or between repositories
 # and return Gitlab::CompareResult object that responds to commits and diffs
 class CompareService
-  def execute(current_user, source_project, source_branch, target_project, target_branch)
-    # Try to compare branches to get commits list and diffs
-    #
-    # Note: Use satellite only when need to compare between two repos
-    # because satellites are slower than operations on bare repo
-    if target_project == source_project
-      Gitlab::CompareResult.new(
-        Gitlab::Git::Compare.new(
-          target_project.repository.raw_repository,
-          target_branch,
-          source_branch,
-        )
+  def execute(source_project, source_branch, target_project, target_branch)
+    source_sha = source_project.commit(source_branch).sha
+
+    # If compare with other project we need to fetch ref first
+    unless target_project == source_project
+      random_string = SecureRandom.hex
+
+      target_project.repository.fetch_ref(
+        source_project.repository.path_to_repo,
+        "refs/heads/#{source_branch}",
+        "refs/tmp/#{random_string}/head"
       )
-    else
-      Gitlab::Satellite::CompareAction.new(
-        current_user,
-        target_project,
-        target_branch,
-        source_project,
-        source_branch
-      ).result
     end
+
+    Gitlab::CompareResult.new(
+      Gitlab::Git::Compare.new(
+        target_project.repository.raw_repository,
+        target_branch,
+        source_sha,
+      )
+    )
   end
 end
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb
index bd24510095..d7b40ee890 100644
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
@@ -1,17 +1,80 @@
 module Files
   class BaseService < ::BaseService
-    attr_reader :ref, :path
+    class ValidationError < StandardError; end
 
-    def initialize(project, user, params, ref, path = nil)
-      @project, @current_user, @params = project, user, params.dup
-      @ref = ref
-      @path = path
+    def execute
+      @current_branch = params[:current_branch]
+      @target_branch  = params[:target_branch]
+      @commit_message = params[:commit_message]
+      @file_path      = params[:file_path]
+      @file_content   = if params[:file_content_encoding] == 'base64'
+                          Base64.decode64(params[:file_content])
+                        else
+                          params[:file_content]
+                        end
+
+      # Validate parameters
+      validate
+
+      # Create new branch if it different from current_branch
+      if @target_branch != @current_branch
+        create_target_branch
+      end
+
+      if sha = commit
+        after_commit(sha, @target_branch)
+        success
+      else
+        error("Something went wrong. Your changes were not committed")
+      end
+    rescue ValidationError => ex
+      error(ex.message)
     end
 
     private
 
-    def repository
-      project.repository
+    def after_commit(sha, branch)
+      PostCommitService.new(project, current_user).execute(sha, branch)
+    end
+
+    def current_branch
+      @current_branch ||= params[:current_branch]
+    end
+
+    def target_branch
+      @target_branch ||= params[:target_branch]
+    end
+
+    def raise_error(message)
+      raise ValidationError.new(message)
+    end
+
+    def validate
+      allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(@target_branch)
+
+      unless allowed
+        raise_error("You are not allowed to push into this branch")
+      end
+
+      unless project.empty_repo?
+        unless repository.branch_names.include?(@current_branch)
+          raise_error("You can only create files if you are on top of a branch")
+        end
+
+        if @current_branch != @target_branch
+          if repository.branch_names.include?(@target_branch)
+            raise_error("Branch with such name already exists. You need to switch to this branch in order to make changes")
+          end
+        end
+      end
+    end
+
+    def create_target_branch
+      result = CreateBranchService.new(project, current_user).execute(@target_branch, @current_branch)
+
+      unless result[:status] == :success
+        raise_error("Something went wrong when we tried to create #{@target_branch} for you")
+      end
     end
   end
 end
diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb
index 23833aa78e..91d715b2d6 100644
--- a/app/services/files/create_service.rb
+++ b/app/services/files/create_service.rb
@@ -1,52 +1,30 @@
 require_relative "base_service"
 
 module Files
-  class CreateService < BaseService
-    def execute
-      allowed = Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(ref)
+  class CreateService < Files::BaseService
+    def commit
+      repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch)
+    end
 
-      unless allowed
-        return error("You are not allowed to create file in this branch")
-      end
+    def validate
+      super
 
-      file_name = File.basename(path)
-      file_path = path
+      file_name = File.basename(@file_path)
 
       unless file_name =~ Gitlab::Regex.file_name_regex
-        return error(
+        raise_error(
           'Your changes could not be committed, because the file name ' +
           Gitlab::Regex.file_name_regex_message
         )
       end
 
-      if project.empty_repo?
-        # everything is ok because repo does not have a commits yet
-      else
-        unless repository.branch_names.include?(ref)
-          return error("You can only create files if you are on top of a branch")
-        end
-
-        blob = repository.blob_at_branch(ref, file_path)
+      unless project.empty_repo?
+        blob = repository.blob_at_branch(@current_branch, @file_path)
 
         if blob
-          return error("Your changes could not be committed, because file with such name exists")
+          raise_error("Your changes could not be committed, because file with such name exists")
         end
       end
-
-
-      new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, file_path)
-      created_successfully = new_file_action.commit!(
-        params[:content],
-        params[:commit_message],
-        params[:encoding],
-        params[:new_branch]
-      )
-
-      if created_successfully
-        success
-      else
-        error("Your changes could not be committed, because the file has been changed")
-      end
     end
   end
 end
diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb
index 1497a0f883..27c881c343 100644
--- a/app/services/files/delete_service.rb
+++ b/app/services/files/delete_service.rb
@@ -1,36 +1,9 @@
 require_relative "base_service"
 
 module Files
-  class DeleteService < BaseService
-    def execute
-      allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(ref)
-
-      unless allowed
-        return error("You are not allowed to push into this branch")
-      end
-
-      unless repository.branch_names.include?(ref)
-        return error("You can only create files if you are on top of a branch")
-      end
-
-      blob = repository.blob_at_branch(ref, path)
-
-      unless blob
-        return error("You can only edit text files")
-      end
-
-      delete_file_action = Gitlab::Satellite::DeleteFileAction.new(current_user, project, ref, path)
-
-      deleted_successfully = delete_file_action.commit!(
-        nil,
-        params[:commit_message]
-      )
-
-      if deleted_successfully
-        success
-      else
-        error("Your changes could not be committed, because the file has been changed")
-      end
+  class DeleteService < Files::BaseService
+    def commit
+      repository.remove_file(current_user, @file_path, @commit_message, @target_branch)
     end
   end
 end
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index 0724d3ae63..a20903c6f0 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -1,39 +1,9 @@
 require_relative "base_service"
 
 module Files
-  class UpdateService < BaseService
-    def execute
-      allowed = ::Gitlab::GitAccess.new(current_user, project).can_push_to_branch?(ref)
-
-      unless allowed
-        return error("You are not allowed to push into this branch")
-      end
-
-      unless repository.branch_names.include?(ref)
-        return error("You can only create files if you are on top of a branch")
-      end
-
-      blob = repository.blob_at_branch(ref, path)
-
-      unless blob
-        return error("You can only edit text files")
-      end
-
-      edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, project, ref, path)
-      edit_file_action.commit!(
-        params[:content],
-        params[:commit_message],
-        params[:encoding],
-        params[:new_branch]
-      )
-
-      success
-    rescue Gitlab::Satellite::CheckoutFailed => ex
-      error("Your changes could not be committed because ref '#{ref}' could not be checked out", 400)
-    rescue Gitlab::Satellite::CommitFailed => ex
-      error("Your changes could not be committed. Maybe there was nothing to commit?", 409)
-    rescue Gitlab::Satellite::PushFailed => ex
-      error("Your changes could not be committed. Maybe the file was changed by another process?", 409)
+  class UpdateService < Files::BaseService
+    def commit
+      repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch)
     end
   end
 end
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 5a2c97b08a..81535450ac 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -10,16 +10,14 @@ class GitPushService
   #
   # Next, this method:
   #  1. Creates the push event
-  #  2. Ensures that the project satellite exists
-  #  3. Updates merge requests
-  #  4. Recognizes cross-references from commit messages
-  #  5. Executes the project's web hooks
-  #  6. Executes the project's services
+  #  2. Updates merge requests
+  #  3. Recognizes cross-references from commit messages
+  #  4. Executes the project's web hooks
+  #  5. Executes the project's services
   #
   def execute(project, user, oldrev, newrev, ref)
     @project, @user = project, user
 
-    project.ensure_satellite_exists
     project.repository.expire_cache
 
     if push_remove_branch?(ref, newrev)
@@ -133,7 +131,8 @@ class GitPushService
   end
 
   def is_default_branch?(ref)
-    Gitlab::Git.branch_ref?(ref) && Gitlab::Git.ref_name(ref) == project.default_branch
+    Gitlab::Git.branch_ref?(ref) &&
+      (Gitlab::Git.ref_name(ref) == project.default_branch || project.default_branch.nil?)
   end
 
   def commit_user(commit)
diff --git a/app/services/merge_requests/auto_merge_service.rb b/app/services/merge_requests/auto_merge_service.rb
deleted file mode 100644
index cdedf48b0c..0000000000
--- a/app/services/merge_requests/auto_merge_service.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-module MergeRequests
-  # AutoMergeService class
-  #
-  # Do git merge in satellite and in case of success
-  # mark merge request as merged and execute all hooks and notifications
-  # Called when you do merge via GitLab UI
-  class AutoMergeService < BaseMergeService
-    def execute(merge_request, commit_message)
-      merge_request.lock_mr
-
-      if Gitlab::Satellite::MergeAction.new(current_user, merge_request).merge!(commit_message)
-        merge_request.merge
-
-        create_merge_event(merge_request, current_user)
-        create_note(merge_request)
-        notification_service.merge_mr(merge_request, current_user)
-        execute_hooks(merge_request, 'merge')
-
-        true
-      else
-        merge_request.unlock_mr
-        false
-      end
-    rescue
-      merge_request.unlock_mr if merge_request.locked?
-      merge_request.mark_as_unmergeable
-      false
-    end
-  end
-end
diff --git a/app/services/merge_requests/base_merge_service.rb b/app/services/merge_requests/base_merge_service.rb
deleted file mode 100644
index 9579573adf..0000000000
--- a/app/services/merge_requests/base_merge_service.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module MergeRequests
-  class BaseMergeService < MergeRequests::BaseService
-
-    private
-
-    def create_merge_event(merge_request, current_user)
-      EventCreateService.new.merge_mr(merge_request, current_user)
-    end
-  end
-end
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 956480938c..a9b29f9654 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -12,12 +12,16 @@ module MergeRequests
       merge_request.target_project ||= (project.forked_from_project || project)
       merge_request.target_branch ||= merge_request.target_project.default_branch
 
-      unless merge_request.target_branch && merge_request.source_branch
-        return build_failed(merge_request, nil)
+      if merge_request.target_branch.blank? || merge_request.source_branch.blank?
+        message =
+          if params[:source_branch] || params[:target_branch]
+            "You must select source and target branch"
+          end
+
+        return build_failed(merge_request, message)
       end
 
       compare_result = CompareService.new.execute(
-        current_user,
         merge_request.source_project,
         merge_request.source_branch,
         merge_request.target_project,
@@ -40,7 +44,6 @@ module MergeRequests
           merge_request.compare_diffs = diffs
 
         elsif diffs == false
-          # satellite timeout return false
           merge_request.can_be_created = false
           merge_request.compare_failed = true
         end
@@ -59,9 +62,6 @@ module MergeRequests
       end
 
       merge_request
-
-    rescue Gitlab::Satellite::BranchesWithoutParent
-      return build_failed(merge_request, "Selected branches have no common commit so they cannot be merged.")
     end
 
     def build_failed(merge_request, message)
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index 327ead4ff3..2107529a21 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -1,22 +1,57 @@
 module MergeRequests
   # MergeService class
   #
-  # Mark existing merge request as merged
-  # and execute all hooks and notifications
-  # Called when you do merge via command line and push code
-  # to target branch
-  class MergeService < BaseMergeService
+  # Do git merge and in case of success
+  # mark merge request as merged and execute all hooks and notifications
+  # Executed when you do merge via GitLab UI
+  #
+  class MergeService < MergeRequests::BaseService
+    attr_reader :merge_request, :commit_message
+
     def execute(merge_request, commit_message)
-      merge_request.merge
+      @commit_message = commit_message
+      @merge_request = merge_request
 
-      create_merge_event(merge_request, current_user)
-      create_note(merge_request)
-      notification_service.merge_mr(merge_request, current_user)
-      execute_hooks(merge_request, 'merge')
+      unless @merge_request.mergeable?
+        return error('Merge request is not mergeable')
+      end
 
-      true
-    rescue
-      false
+      merge_request.in_locked_state do
+        if merge_changes
+          after_merge
+          success
+        else
+          error('Can not merge changes')
+        end
+      end
+    end
+
+    private
+
+    def merge_changes
+      if sha = commit
+        after_commit(sha, merge_request.target_branch)
+      end
+    end
+
+    def commit
+      committer = repository.user_to_comitter(current_user)
+
+      options = {
+        message: commit_message,
+        author: committer,
+        committer: committer
+      }
+
+      repository.merge(merge_request.source_sha, merge_request.target_branch, options)
+    end
+
+    def after_commit(sha, branch)
+      PostCommitService.new(project, current_user).execute(sha, branch)
+    end
+
+    def after_merge
+      MergeRequests::PostMergeService.new(project, current_user).execute(merge_request)
     end
   end
 end
diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb
new file mode 100644
index 0000000000..aceb8cb902
--- /dev/null
+++ b/app/services/merge_requests/post_merge_service.rb
@@ -0,0 +1,22 @@
+module MergeRequests
+  # PostMergeService class
+  #
+  # Mark existing merge request as merged
+  # and execute all hooks and notifications
+  #
+  class PostMergeService < MergeRequests::BaseService
+    def execute(merge_request)
+      merge_request.mark_as_merged
+      create_merge_event(merge_request, current_user)
+      create_note(merge_request)
+      notification_service.merge_mr(merge_request, current_user)
+      execute_hooks(merge_request, 'merge')
+    end
+
+    private
+
+    def create_merge_event(merge_request, current_user)
+      EventCreateService.new.merge_mr(merge_request, current_user)
+    end
+  end
+end
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index d0648da049..e903e48e3c 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -33,9 +33,9 @@ module MergeRequests
 
 
       merge_requests.uniq.select(&:source_project).each do |merge_request|
-        MergeRequests::MergeService.
+        MergeRequests::PostMergeService.
           new(merge_request.target_project, @current_user).
-          execute(merge_request, nil)
+          execute(merge_request)
       end
     end
 
diff --git a/app/services/post_commit_service.rb b/app/services/post_commit_service.rb
new file mode 100644
index 0000000000..8592c8d238
--- /dev/null
+++ b/app/services/post_commit_service.rb
@@ -0,0 +1,71 @@
+class PostCommitService < BaseService
+  include Gitlab::Popen
+
+  attr_reader :changes, :repo_path
+
+  def execute(sha, branch)
+    commit = repository.commit(sha)
+    full_ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
+    old_sha = commit.parent_id || Gitlab::Git::BLANK_SHA
+    @changes = "#{old_sha} #{sha} #{full_ref}"
+    @repo_path = repository.path_to_repo
+
+    post_receive
+  end
+
+  private
+
+  def post_receive
+    hook = hook_file('post-receive', repo_path)
+    return true if hook.nil?
+    call_receive_hook(hook)
+  end
+
+  def call_receive_hook(hook)
+    # function  will return true if succesful
+    exit_status = false
+
+    vars = {
+      'GL_ID' => Gitlab::ShellEnv.gl_id(current_user),
+      'PWD' => repo_path
+    }
+
+    options = {
+      chdir: repo_path
+    }
+
+    # we combine both stdout and stderr as we don't know what stream
+    # will be used by the custom hook
+    Open3.popen2e(vars, hook, options) do |stdin, stdout_stderr, wait_thr|
+      exit_status = true
+      stdin.sync = true
+
+      # in git, pre- and post- receive hooks may just exit without
+      # reading stdin. We catch the exception to avoid a broken pipe
+      # warning
+      begin
+        # inject all the changes as stdin to the hook
+        changes.lines do |line|
+          stdin.puts line
+        end
+      rescue Errno::EPIPE
+      end
+
+      # need to close stdin before reading stdout
+      stdin.close
+
+      # only output stdut_stderr if scripts doesn't return 0
+      unless wait_thr.value == 0
+        exit_status = false
+      end
+    end
+
+    exit_status
+  end
+
+  def hook_file(hook_type, repo_path)
+    hook_path = File.join(repo_path.strip, 'hooks')
+    hook_file = "#{hook_path}/#{hook_type}"
+    hook_file if File.exist?(hook_file)
+  end
+end
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 403f419ec5..28872c8925 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -27,7 +27,6 @@ module Projects
         end
       end
 
-      project.satellite.destroy
       log_info("Project \"#{project.name}\" was removed")
       system_hook_service.execute_hooks_for(project, :destroy)
       true
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index f43c0ef70e..550ed6897d 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -33,9 +33,6 @@ module Projects
           raise TransferError.new("Project with same path in target namespace already exists")
         end
 
-        # Remove old satellite
-        project.satellite.destroy
-
         # Apply new namespace id
         project.namespace = new_namespace
         project.save!
@@ -51,9 +48,6 @@ module Projects
         # Move wiki repo also if present
         gitlab_shell.mv_repository("#{old_path}.wiki", "#{new_path}.wiki")
 
-        # Create a new satellite (reload project from DB)
-        Project.find(project.id).ensure_satellite_exists
-
         # clear project cached events
         project.reset_events_cache
 
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index 96f188e4aa..9c3e1703c8 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -12,8 +12,8 @@
         \/
         = text_field_tag 'file_name', params[:file_name], placeholder: "File name",
           required: true, class: 'form-control new-file-name'
-        .pull-right
-          = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'form-control'
+      .pull-right
+        = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'form-control'
 
   .file-content.code
     %pre.js-edit-mode-pane#editor
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index dac984f8c3..7c2a4fece9 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -6,11 +6,12 @@
     = render 'shared/commit_message_container', params: params,
              placeholder: 'Add new file'
 
-    .form-group.branch
-      = label_tag 'branch', class: 'control-label' do
-        Branch
-      .col-sm-10
-        = text_field_tag 'new_branch', @ref, class: "form-control"
+    - unless @project.empty_repo?
+      .form-group.branch
+        = label_tag 'branch', class: 'control-label' do
+          Branch
+        .col-sm-10
+          = text_field_tag 'new_branch', @ref, class: "form-control"
 
     = hidden_field_tag 'content', '', id: 'file-content'
     = render 'projects/commit_button', ref: @ref,
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index ff9c0cdb28..7709330611 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -35,7 +35,7 @@
     - if @merge_request.compare_failed
       .alert.alert-danger
         %h4 Compare failed
-        %p We can't compare selected branches. It may be because of huge diff or satellite timeout. Please try again or select different branches.
+        %p We can't compare selected branches. It may be because of huge diff. Please try again or select different branches.
     - else
       .light-well
         .center
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 633a54f362..76f44211da 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -24,7 +24,7 @@
         = icon('history')
         Commits
         %span.badge= @commits.size
-    %li.diffs-tab
+    %li.diffs-tab.active
       = link_to url_for(params), data: {target: '#diffs', action: 'diffs', toggle: 'tab'} do
         = icon('list-alt')
         Changes
@@ -33,7 +33,7 @@
   .tab-content
     #commits.commits.tab-pane
       = render "projects/commits/commits", project: @project
-    #diffs.diffs.tab-pane
+    #diffs.diffs.tab-pane.active
       - if @diffs.present?
         = render "projects/diffs/diffs", diffs: @diffs, project: @project
       - elsif @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index c57eee1414..2662e3aff6 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -6,40 +6,25 @@
     = render "projects/merge_requests/show/mr_box"
     %hr
     .append-bottom-20
-      .slead
-        %span From
-        - if @merge_request.for_fork?
-          %strong.label-branch<
-            - if @merge_request.source_project
-              = link_to @merge_request.source_project_namespace, namespace_project_path(@merge_request.source_project.namespace, @merge_request.source_project)
-            - else
-              \ #{@merge_request.source_project_namespace}
-            \:#{@merge_request.source_branch}
+      - if @merge_request.open?
+        .btn-group.btn-group-sm.pull-right
+          %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
+            = icon('download')
+            Download as
+            %span.caret
+          %ul.dropdown-menu
+            %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
+            %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
+      .light
+        %div
+          %span From
+          %span.label-branch #{source_branch_with_namespace(@merge_request)}
           %span into
-          %strong.label-branch #{@merge_request.target_project_namespace}:#{@merge_request.target_branch}
-        - else
-          %strong.label-branch #{@merge_request.source_branch}
-          %span into
-          %strong.label-branch #{@merge_request.target_branch}
-        - if @merge_request.open?
-          .btn-group.btn-group-sm.pull-right
-            %a.btn.btn-sm.dropdown-toggle{ data: {toggle: :dropdown} }
-              = icon('download')
-              Download as
-              %span.caret
-            %ul.dropdown-menu
-              %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
-              %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
-
-    - if @merge_request.open? and @merge_request.source_branch_exists?
-      .append-bottom-20
-        .slead
-          %span
-            Fetch the branch with
-            %strong.label-branch<
-              git fetch
-              \ #{@merge_request.source_project.http_url_to_repo}
-              \ #{@merge_request.source_branch}
+          %span.label-branch #{@merge_request.target_branch}
+        - if @merge_request.open? && !@merge_request.branch_missing?
+          %div
+            If you want to try or merge this request manually, you can use the
+            = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
 
     = render "projects/merge_requests/show/how_to_merge"
     = render "projects/merge_requests/widget/show.html.haml"
diff --git a/app/views/projects/merge_requests/automerge.js.haml b/app/views/projects/merge_requests/merge.js.haml
similarity index 100%
rename from app/views/projects/merge_requests/automerge.js.haml
rename to app/views/projects/merge_requests/merge.js.haml
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index 3b7f283daf..a71b181a6a 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -1 +1 @@
-= render "projects/commits/commits", project: @merge_request.source_project
+= render "projects/commits/commits", project: @merge_request.project
diff --git a/app/views/projects/merge_requests/show/_diffs.html.haml b/app/views/projects/merge_requests/show/_diffs.html.haml
index 786b5f3906..626970f39b 100644
--- a/app/views/projects/merge_requests/show/_diffs.html.haml
+++ b/app/views/projects/merge_requests/show/_diffs.html.haml
@@ -1,5 +1,5 @@
 - if @merge_request_diff.collected?
-  = render "projects/diffs/diffs", diffs: @merge_request.diffs, project: @merge_request.source_project
+  = render "projects/diffs/diffs", diffs: @merge_request.diffs, project: @merge_request.project
 - elsif @merge_request_diff.empty?
   .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
 - else
diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
index 22f601ac99..db1575f899 100644
--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -3,42 +3,45 @@
     .modal-content
       .modal-header
         %a.close{href: "#", "data-dismiss" => "modal"} ×
-        %h3 How to merge
+        %h3 Check out, review and merge locally
       .modal-body
-        - if @merge_request.for_fork?
-          - source_remote = @merge_request.source_project.namespace.nil? ? "source" :@merge_request.source_project.namespace.path
-          - target_remote = @merge_request.target_project.namespace.nil? ? "target" :@merge_request.target_project.namespace.path
-          %p
-            %strong Step 1.
-            Fetch the code and create a new branch pointing to it
-          %pre.dark
+        %p
+          %strong Step 1. 
+          Fetch and check out the branch for this merge request
+        %pre.dark
+          - if @merge_request.for_fork?
             :preserve
               git fetch #{@merge_request.source_project.http_url_to_repo} #{@merge_request.source_branch}
               git checkout -b #{@merge_request.source_project_path}-#{@merge_request.source_branch} FETCH_HEAD
-          %p
-            %strong Step 2.
-            Merge the branch and push the changes to GitLab
-          %pre.dark
-            :preserve
-              git checkout #{@merge_request.target_branch}
-              git merge --no-ff #{@merge_request.source_project_path}-#{@merge_request.source_branch}
-              git push origin #{@merge_request.target_branch}
-        - else
-          %p
-            %strong Step 1.
-            Update the repo and checkout the branch we are going to merge
-          %pre.dark
+          - else
             :preserve
               git fetch origin
               git checkout -b #{@merge_request.source_branch} origin/#{@merge_request.source_branch}
-          %p
-            %strong Step 2.
-            Merge the branch and push the changes to GitLab
-          %pre.dark
+        %p
+          %strong Step 2.
+          Review the changes locally
+
+        %p
+          %strong Step 3.
+          Merge the branch and fix any conflicts that come up
+        %pre.dark
+          - if @merge_request.for_fork?
+            :preserve
+              git checkout #{@merge_request.target_branch}
+              git merge --no-ff #{@merge_request.source_project_path}-#{@merge_request.source_branch}
+          - else
             :preserve
               git checkout #{@merge_request.target_branch}
               git merge --no-ff #{@merge_request.source_branch}
-              git push origin #{@merge_request.target_branch}
+        %p
+          %strong Step 4.
+          Push the result of the merge to GitLab
+        %pre.dark
+          :preserve
+            git push origin #{@merge_request.target_branch}
+        - unless @merge_request.can_be_merged_by?(current_user)
+          %p
+            Note that pushing to GitLab requires write access to this repository.
 
 :javascript
   $(function(){
diff --git a/app/views/projects/merge_requests/widget/_closed.html.haml b/app/views/projects/merge_requests/widget/_closed.html.haml
index b5704c502c..f3cc0e7e8a 100644
--- a/app/views/projects/merge_requests/widget/_closed.html.haml
+++ b/app/views/projects/merge_requests/widget/_closed.html.haml
@@ -6,4 +6,7 @@
       - if @merge_request.closed_event
         by #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)}
         #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
-    %p Changes were not merged into target branch
+    %p 
+      = succeed '.' do
+        The changes were not merged into
+        %span.label-branch= @merge_request.target_branch
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index f04eac0e3b..4d4e2f68f6 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -1,49 +1,28 @@
 - if @merge_request.has_ci?
   .mr-widget-heading
-    .ci_widget.ci-success{style: "display:none"}
-      = icon("check")
-      %span CI build passed
-      for #{@merge_request.last_commit_short_sha}.
-      = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
-
-    .ci_widget.ci-skipped{style: "display:none"}
-      = icon("check")
-      %span CI build skipped
-      for #{@merge_request.last_commit_short_sha}.
-      = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
-
-    .ci_widget.ci-failed{style: "display:none"}
-      = icon("times")
-      %span CI build failed
-      for #{@merge_request.last_commit_short_sha}.
-      = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
-
-    - [:running, :pending].each do |status|
+    - [:success, :skipped, :canceled, :failed, :running, :pending].each do |status|
       .ci_widget{class: "ci-#{status}", style: "display:none"}
-        = icon("clock-o")
+        - if status == :success
+          - status = "passed"
+          = icon("check-circle")
+        - else
+          = icon("circle")
         %span CI build #{status}
         for #{@merge_request.last_commit_short_sha}.
-        = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
+        %span.ci-coverage
+        = link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
 
     .ci_widget
       = icon("spinner spin")
-      Checking for CI status for #{@merge_request.last_commit_short_sha}
+      Checking CI status for #{@merge_request.last_commit_short_sha}&hellip;
 
     .ci_widget.ci-not_found{style: "display:none"}
-      = icon("times")
-      %span Can not find commit in the CI server
-      for #{@merge_request.last_commit_short_sha}.
-      
-
-    .ci_widget.ci-canceled{style: "display:none"}
-      = icon("times")
-      %span CI build canceled
-      for #{@merge_request.last_commit_short_sha}.
-      = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
+      = icon("times-circle")
+      Could not find CI status for #{@merge_request.last_commit_short_sha}.
 
     .ci_widget.ci-error{style: "display:none"}
-      = icon("times")
-      %span Cannot connect to the CI server. Please check your settings and try again.
+      = icon("times-circle")
+      Could not connect to the CI server. Please check your settings and try again.
 
   :coffeescript
     $ ->
diff --git a/app/views/projects/merge_requests/widget/_locked.html.haml b/app/views/projects/merge_requests/widget/_locked.html.haml
index 13ec278847..78d0783cba 100644
--- a/app/views/projects/merge_requests/widget/_locked.html.haml
+++ b/app/views/projects/merge_requests/widget/_locked.html.haml
@@ -2,7 +2,8 @@
   = render 'projects/merge_requests/widget/heading'
   .mr-widget-body
     %h4
-      Merge in progress...
+      = icon("spinner spin")
+      Merge in progress&hellip;
     %p
-      Merging is in progress. While merging this request is locked and cannot be closed.
+      This merge request is in the process of being merged, during which time it is locked and cannot be closed.
 
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml
index a3b1314081..d22dfa085b 100644
--- a/app/views/projects/merge_requests/widget/_merged.html.haml
+++ b/app/views/projects/merge_requests/widget/_merged.html.haml
@@ -7,23 +7,31 @@
         by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)}
         #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
     %div
-      - if @source_branch.blank?
-        Source branch has been removed
+      - if !@merge_request.source_branch_exists?
+        = succeed '.' do
+          The changes were merged into
+          %span.label-branch= @merge_request.target_branch
+        The source branch has been removed.
 
-      - elsif can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && @merge_request.merged?
+      - elsif can_remove_branch?(@merge_request.source_project, @merge_request.source_branch)
         .remove_source_branch_widget
-          %p Changes merged into #{@merge_request.target_branch}. You can remove source branch now
+          %p 
+            = succeed '.' do
+              The changes were merged into
+              %span.label-branch= @merge_request.target_branch
+            You can remove the source branch now.
           = link_to namespace_project_branch_path(@merge_request.source_project.namespace, @merge_request.source_project, @source_branch), remote: true, method: :delete, class: "btn btn-primary btn-sm remove_source_branch" do
             %i.fa.fa-times
             Remove Source Branch
 
         .remove_source_branch_widget.failed.hide
-          Failed to remove source branch '#{@merge_request.source_branch}'
+          %p 
+            Failed to remove source branch '#{@merge_request.source_branch}'.
 
         .remove_source_branch_in_progress.hide
-          %i.fa.fa-spinner.fa-spin
-          &nbsp;
-          Removing source branch '#{@merge_request.source_branch}'. Please wait. Page will be automatically reloaded. &nbsp;
+          %p
+            = icon('spinner spin')
+            Removing source branch '#{@merge_request.source_branch}'. Please wait. This page will be automatically reload.
 
         :coffeescript
           $('.remove_source_branch').on 'click', ->
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index bb794912f8..0aad9bb3e8 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -3,8 +3,6 @@
   .mr-widget-body
     - if @project.archived?
       = render 'projects/merge_requests/widget/open/archived'
-    - elsif !@project.satellite.exists?
-      = render 'projects/merge_requests/widget/open/no_satellite'
     - elsif @merge_request.commits.blank?
       = render 'projects/merge_requests/widget/open/nothing'
     - elsif @merge_request.branch_missing?
@@ -24,6 +22,6 @@
     .mr-widget-footer
       %span
         %i.fa.fa-check
-        Accepting this merge request will close #{@closes_issues.size == 1 ? 'issue' : 'issues'}
+        Accepting this merge request will close #{"issue".pluralize(@closes_issues.size)}
         = succeed '.' do
           != gfm(issues_sentence(@closes_issues))
diff --git a/app/views/projects/merge_requests/widget/_show.html.haml b/app/views/projects/merge_requests/widget/_show.html.haml
index 263cab7a9e..a489d4f9b2 100644
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -11,10 +11,10 @@
   var merge_request_widget;
 
   merge_request_widget = new MergeRequestWidget({
-    url_to_automerge_check: "#{automerge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
+    url_to_automerge_check: "#{merge_check_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
     check_enable: #{@merge_request.unchecked? ? "true" : "false"},
     url_to_ci_check: "#{ci_status_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)}",
     ci_enable: #{@project.ci_service ? "true" : "false"},
-    current_status: "#{@merge_request.automerge_status}",
+    current_status: "#{@merge_request.gitlab_merge_status}",
   });
 
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index f5bacaf280..e1525f6aeb 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -1,4 +1,4 @@
-= form_for [:automerge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form js-requires-input' } do |f|
+= form_for [:merge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form js-requires-input' } do |f|
   = hidden_field_tag :authenticity_token, form_authenticity_token
   .accept-merge-holder.clearfix.js-toggle-container
     .accept-action
@@ -8,22 +8,16 @@
       .accept-control.checkbox
         = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do
           = check_box_tag :should_remove_source_branch
-          Remove source-branch
+          Remove source branch
     .accept-control
-      = link_to "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message" do
-        %i.fa.fa-edit
+      = link_to "#", class: "modify-merge-commit-link js-toggle-button" do
+        = icon('edit')
         Modify commit message
     .js-toggle-content.hide.prepend-top-20
       = render 'shared/commit_message_container', params: params,
           text: @merge_request.merge_commit_message,
           rows: 14, hint: true
 
-  %br
-  .light
-    If you want to merge this request manually, you can use the
-    %strong
-      = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
-
   :coffeescript
     $('.accept-mr-form').on 'ajax:before', ->
       btn = $('.accept_merge_request')
diff --git a/app/views/projects/merge_requests/widget/open/_archived.html.haml b/app/views/projects/merge_requests/widget/open/_archived.html.haml
index eaf113ee56..ab30fa6b24 100644
--- a/app/views/projects/merge_requests/widget/open/_archived.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_archived.html.haml
@@ -1,2 +1,4 @@
+%h4 
+  Project is archived
 %p
-  %strong Archived projects do not provide commit access.
+  This merge request cannot be merged because archived projects cannot be written to.
diff --git a/app/views/projects/merge_requests/widget/open/_check.html.haml b/app/views/projects/merge_requests/widget/open/_check.html.haml
index e775447cb7..b6b8974297 100644
--- a/app/views/projects/merge_requests/widget/open/_check.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_check.html.haml
@@ -1,6 +1,6 @@
 %strong
-  %i.fa.fa-spinner.fa-spin
-  Checking automatic merge…
+  = icon("spinner spin")
+  Checking ability to merge automatically&hellip;
 
 :coffeescript
   $ ->
diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
index 7dc3b4eb2c..e6c089fefb 100644
--- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
@@ -1,10 +1,10 @@
-- if @merge_request.can_be_merged_by?(current_user)
-  %h4
-    This merge request contains merge conflicts that must be resolved.
-  %p
-    You can merge it manually using the
-    %strong
-      = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
-- else
-  %strong This merge request contains merge conflicts that must be resolved.
-  Only those with write access to this repository can merge merge requests.
+%h4
+  = icon("exclamation-triangle")
+  This merge request contains merge conflicts
+
+%p
+  Please resolve these conflicts or 
+  - if @merge_request.can_be_merged_by?(current_user)
+    #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
+  - else
+    ask someone with write access to this repository to merge this request manually.
diff --git a/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml b/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
index 1c565bae80..c9f0762949 100644
--- a/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
@@ -1,16 +1,16 @@
-%h4
-  Can't be merged
-%p
-  This merge request can not be accepted because branch
-  - unless @merge_request.source_branch_exists?
-    %span.label.label-inverse= @merge_request.source_branch
-    does not exist in
-    %span.label.label-info= @merge_request.source_project_path
-    %br
-    %strong Please close this merge request and open a new merge request to change source branches.
-  - else
-    %span.label.label-inverse= @merge_request.target_branch
-    does not exist in
-    %span.label.label-info= @merge_request.target_project_path
-    %br
-    %strong Please close this merge request or change to another target branch.
+- unless @merge_request.source_branch_exists?
+  %h4
+    = icon("exclamation-triangle")
+    Source branch
+    %span.label-branch= source_branch_with_namespace(@merge_request)
+    does not exist
+  %p
+    Please restore the source branch or close this merge request and open a new merge request with a different source branch.
+- else
+  %h4
+    = icon("exclamation-triangle")
+    Target branch
+    %span.label-branch= @merge_request.target_branch
+    does not exist
+  %p
+    Please restore the target branch or use a different target branch.
diff --git a/app/views/projects/merge_requests/widget/open/_no_satellite.html.haml b/app/views/projects/merge_requests/widget/open/_no_satellite.html.haml
deleted file mode 100644
index 3718cfd833..0000000000
--- a/app/views/projects/merge_requests/widget/open/_no_satellite.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%p
-  %span
-    %strong This repository does not have a satellite. Please ask an administrator to fix this issue!
diff --git a/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml b/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
index 82f6ffd8fc..a8145558ca 100644
--- a/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
@@ -1,2 +1,4 @@
-%strong This request can be merged automatically.
-Only those with write access to this repository can merge merge requests.
+%h4 
+  Ready to be merged automatically
+%p
+  Ask someone with write access to this repository to merge this request.
diff --git a/app/views/projects/merge_requests/widget/open/_nothing.html.haml b/app/views/projects/merge_requests/widget/open/_nothing.html.haml
index 4d526576bc..35626b624b 100644
--- a/app/views/projects/merge_requests/widget/open/_nothing.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_nothing.html.haml
@@ -1,8 +1,8 @@
-%h4 Nothing to merge
-%p
+%h4 
+  = icon("exclamation-triangle")
   Nothing to merge from
-  %span.label-branch #{@merge_request.source_branch}
-  to
-  %span.label-branch #{@merge_request.target_branch}
-  %br
-  Try to use different branches or push new code.
+  %span.label-branch= source_branch_with_namespace(@merge_request)
+  into
+  %span.label-branch= @merge_request.target_branch
+%p
+  Please push new commits to the source branch or use a different target branch.
diff --git a/app/views/projects/merge_requests/widget/open/_reload.html.haml b/app/views/projects/merge_requests/widget/open/_reload.html.haml
index 5787f6efea..acfc31725e 100644
--- a/app/views/projects/merge_requests/widget/open/_reload.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_reload.html.haml
@@ -1 +1,6 @@
-This merge request cannot be merged. Try to reload the page.
+%h4
+  = icon("exclamation-triangle")
+  This merge request failed to be merged automatically
+
+%p
+  Please reload the page to find out the reason.
diff --git a/app/views/projects/merge_requests/widget/open/_wip.html.haml b/app/views/projects/merge_requests/widget/open/_wip.html.haml
index 4ce3ab3127..0cf16542cc 100644
--- a/app/views/projects/merge_requests/widget/open/_wip.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_wip.html.haml
@@ -1,13 +1,5 @@
-- if @merge_request.can_be_merged_by?(current_user)
-  %h4
-    This merge request cannot be accepted because it is marked as Work In Progress.
+%h4
+  This merge request is currently a Work In Progress
 
-  %p
-    %button.btn.disabled{:type => 'button'}
-      %i.fa.fa-warning
-      Accept Merge Request
-    &nbsp;
-    When the merge request is ready, remove the "WIP" prefix from the title to allow it to be accepted.
-- else
-  %strong This merge request is marked as Work In Progress.
-  Only those with write access to this repository can merge merge requests.
+%p
+  When this merge request is ready, remove the "WIP" prefix from the title to allow it to be merged.
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index ac8c1936c9..3489bf3f19 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -16,10 +16,10 @@
       %p.help-block
         - if issuable.work_in_progress?
           Remove the <code>WIP</code> prefix from the title to allow this
-          <strong>Work In Progress</strong> merge request to be accepted when it's ready.
+          <strong>Work In Progress</strong> merge request to be merged when it's ready.
         - else
           Start the title with <code>[WIP]</code> or <code>WIP:</code> to prevent a
-          <strong>Work In Progress</strong> merge request from being accepted before it's ready.
+          <strong>Work In Progress</strong> merge request from being merged before it's ready.
 .form-group.issuable-description
   = f.label :description, 'Description', class: 'control-label'
   .col-sm-10
diff --git a/app/workers/auto_merge_worker.rb b/app/workers/auto_merge_worker.rb
deleted file mode 100644
index a6dd73eee5..0000000000
--- a/app/workers/auto_merge_worker.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class AutoMergeWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: :default
-
-  def perform(merge_request_id, current_user_id, params)
-    params = params.with_indifferent_access
-    current_user = User.find(current_user_id)
-    merge_request = MergeRequest.find(merge_request_id)
-    merge_request.should_remove_source_branch = params[:should_remove_source_branch]
-    merge_request.automerge!(current_user, params[:commit_message])
-  end
-end
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb
new file mode 100644
index 0000000000..6a8665c179
--- /dev/null
+++ b/app/workers/merge_worker.rb
@@ -0,0 +1,19 @@
+class MergeWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: :default
+
+  def perform(merge_request_id, current_user_id, params)
+    params = params.with_indifferent_access
+    current_user = User.find(current_user_id)
+    merge_request = MergeRequest.find(merge_request_id)
+
+    result = MergeRequests::MergeService.new(merge_request.target_project, current_user).
+      execute(merge_request, params[:commit_message])
+
+    if result[:status] == :success && params[:should_remove_source_branch].present?
+      DeleteBranchService.new(merge_request.source_project, current_user).
+        execute(merge_request.source_branch)
+    end
+  end
+end
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 94832872d1..b546f8777e 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -27,7 +27,6 @@ class RepositoryImportWorker
 
     project.import_finish
     project.save
-    project.satellite.create unless project.satellite.exists?
     ProjectCacheWorker.perform_async(project.id)
     Gitlab::BitbucketImport::KeyDeleter.new(project).execute if project.import_type == 'bitbucket'
   end
diff --git a/config/routes.rb b/config/routes.rb
index 1166a4b3eb..d7307a61ed 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -463,8 +463,8 @@ Gitlab::Application.routes.draw do
           member do
             get :diffs
             get :commits
-            post :automerge
-            get :automerge_check
+            post :merge
+            get :merge_check
             get :ci_status
             post :toggle_subscription
           end
diff --git a/doc/development/architecture.md b/doc/development/architecture.md
index 541af487bb..c00d290371 100644
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
@@ -56,9 +56,9 @@ To serve repositories over SSH there's an add-on application called gitlab-shell
 
 A typical install of GitLab will be on GNU/Linux. It uses Nginx or Apache as a web front end to proxypass the Unicorn web server. By default, communication between Unicorn and the front end is via a Unix domain socket but forwarding requests via TCP is also supported. The web front end accesses `/home/git/gitlab/public` bypassing the Unicorn server to serve static pages, uploads (e.g. avatar images or attachments), and precompiled assets. GitLab serves web pages and a [GitLab API](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/api) using the Unicorn web server. It uses Sidekiq as a job queue which, in turn, uses redis as a non-persistent database backend for job information, meta data, and incoming jobs.
 
-The GitLab web app uses MySQL or PostgreSQL for persistent database information (e.g. users, permissions, issues, other meta data). GitLab stores the bare git repositories it serves in `/home/git/repositories` by default. It also keeps default branch and hook information with the bare repository. `/home/git/gitlab-satellites` keeps checked out repositories when performing actions such as a merge request, editing files in the web interface, etc.
+The GitLab web app uses MySQL or PostgreSQL for persistent database information (e.g. users, permissions, issues, other meta data). GitLab stores the bare git repositories it serves in `/home/git/repositories` by default. It also keeps default branch and hook information with the bare repository.
 
-The satellite repository is used by the web interface for editing repositories and the wiki which is also a git repository. When serving repositories over HTTP/HTTPS GitLab utilizes the GitLab API to resolve authorization and access as well as serving git objects.
+When serving repositories over HTTP/HTTPS GitLab utilizes the GitLab API to resolve authorization and access as well as serving git objects.
 
 The add-on component gitlab-shell serves repositories over SSH. It manages the SSH keys within `/home/git/.ssh/authorized_keys` which should not be manually edited. gitlab-shell accesses the bare repositories directly to serve git objects and communicates with redis to submit jobs to Sidekiq for GitLab to process. gitlab-shell queries the GitLab API to determine authorization and access.
 
@@ -129,7 +129,7 @@ Note: `/home/git/` is shorthand for `/home/git`.
 
 gitlabhq (includes Unicorn and Sidekiq logs)
 
-- `/home/git/gitlab/log/` contains `application.log`, `production.log`, `sidekiq.log`, `unicorn.stdout.log`, `githost.log`, `satellites.log`, and `unicorn.stderr.log` normally.
+- `/home/git/gitlab/log/` contains `application.log`, `production.log`, `sidekiq.log`, `unicorn.stdout.log`, `githost.log` and `unicorn.stderr.log` normally.
 
 gitlab-shell
 
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 6e2bb4191c..55b6f216dd 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -216,10 +216,6 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
     sudo chmod -R u+rwX,go-w log/
     sudo chmod -R u+rwX tmp/
 
-    # Create directory for satellites
-    sudo -u git -H mkdir /home/git/gitlab-satellites
-    sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
-
     # Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories
     sudo chmod -R u+rwX tmp/pids/
     sudo chmod -R u+rwX tmp/sockets/
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index a78590d512..aa0d03b75b 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -40,7 +40,7 @@ We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/) but GitLab
 
 ### Storage
 
-The necessary hard drive space largely depends on the size of the repos you want to store in GitLab but as a *rule of thumb* you should have at least twice as much free space as all your repos combined take up. You need twice the storage because [GitLab satellites](structure.md) contain an extra copy of each repo.
+The necessary hard drive space largely depends on the size of the repos you want to store in GitLab but as a *rule of thumb* you should have at least as much free space as all your repos combined take up. 
 
 If you want to be flexible about growing your hard drive space in the future consider mounting it using LVM so you can add more hard drives when you need them.
 
@@ -113,4 +113,4 @@ On a very active server (10,000 active users) the Sidekiq process can use 1GB+ o
 
 ### Common UI problems with IE
 
-If you experience UI issues with Internet Explorer, please make sure that you have the `Compatibility View` mode disabled.
+If you experience UI issues with Internet Explorer, please make sure that you have the `Compatibility View` mode disabled.
\ No newline at end of file
diff --git a/doc/install/structure.md b/doc/install/structure.md
index 5c03f073c1..d58b0040ee 100644
--- a/doc/install/structure.md
+++ b/doc/install/structure.md
@@ -6,16 +6,14 @@ This is the directory structure you will end up with following the instructions
     |   |-- git
     |       |-- .ssh
     |       |-- gitlab
-    |       |-- gitlab-satellites
     |       |-- gitlab-shell
     |       |-- repositories
 
 * `/home/git/.ssh` - contains openssh settings.  Specifically the `authorized_keys` file managed by gitlab-shell.
 * `/home/git/gitlab` - GitLab core software.
-* `/home/git/gitlab-satellites` - checked out repositories for merge requests and file editing from web UI.  This can be treated as a temporary files directory.
 * `/home/git/gitlab-shell` - Core add-on component of GitLab.  Maintains SSH cloning and other functionality.
 * `/home/git/repositories` - bare repositories for all projects organized by namespace.  This is where the git repositories which are pushed/pulled are maintained for all projects.  **This area is critical data for projects.  [Keep a backup](../raketasks/backup_restore.md)**
 
-*Note: the default locations for gitlab-satellites and repositories can be configured in `config/gitlab.yml` of GitLab and `config.yml` of gitlab-shell.*
+*Note: the default locations for repositories can be configured in `config/gitlab.yml` of GitLab and `config.yml` of gitlab-shell.*
 
 To see a more in-depth overview see the [GitLab architecture doc](../development/architecture.md).
diff --git a/doc/logs/logs.md b/doc/logs/logs.md
index 83c32b0925..27937e5176 100644
--- a/doc/logs/logs.md
+++ b/doc/logs/logs.md
@@ -51,16 +51,6 @@ December 03, 2014 13:20 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/
 error: failed to push some refs to '/Users/vsizov/gitlab-development-kit/repositories/gitlabhq/gitlab_git.git'
 ```
 
-#### satellites.log
-This file lives in `/var/log/gitlab/gitlab-rails/satellites.log` for omnibus package or in `/home/git/gitlab/log/satellites.log` for installations from the source.
-
-In some cases GitLab should perform write actions to git repository, for example when it is needed to merge the merge request or edit a file with online editor. If something went wrong you can look into this file to find out what exactly happened.
-```
-October 07, 2014 11:36: Failed to create satellite for Chesley Weimann III / project1817
-October 07, 2014 11:36: PID: 1872: git clone /Users/vsizov/gitlab-development-kit/gitlab/tmp/tests/repositories/conrad6841/gitlabhq.git /Users/vsizov/gitlab-development-kit/gitlab/tmp/tests/gitlab-satellites/conrad6841/gitlabhq
-October 07, 2014 11:36: PID: 1872: -> fatal: repository '/Users/vsizov/gitlab-development-kit/gitlab/tmp/tests/repositories/conrad6841/gitlabhq.git' does not exist
-```
-
 #### sidekiq.log
 This file lives in `/var/log/gitlab/gitlab-rails/sidekiq.log` for omnibus package or in `/home/git/gitlab/log/sidekiq.log` for installations from the source.
 
@@ -99,4 +89,4 @@ W, [2015-02-13T07:16:01.313000 #9094]  WARN -- : Unicorn::WorkerKiller send SIGQ
 I, [2015-02-13T07:16:01.530733 #9047]  INFO -- : reaped #<Process::Status: pid 9094 exit 0> worker=1
 I, [2015-02-13T07:16:01.534501 #13379]  INFO -- : worker=1 spawned pid=13379
 I, [2015-02-13T07:16:01.534848 #13379]  INFO -- : worker=1 ready
-```
\ No newline at end of file
+```
diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index 69171cd176..d9dce2af48 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -105,24 +105,11 @@ Log directory writable? ... yes
 Tmp directory writable? ... yes
 Init script exists? ... yes
 Init script up-to-date? ... yes
-Projects have satellites? ... yes
 Redis version >= 2.0.0? ... yes
 
 Checking GitLab ... Finished
 ```
 
-## (Re-)Create satellite repositories
-
-This will create satellite repositories for all your projects.
-
-If necessary, remove the `repo_satellites` directory and rerun the commands below.
-
-```
-sudo -u git -H mkdir -p /home/git/gitlab-satellites
-sudo -u git -H bundle exec rake gitlab:satellites:create RAILS_ENV=production
-sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
-```
-
 ## Rebuild authorized_keys file
 
 In some case it is necessary to rebuild the `authorized_keys` file.
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index 3915198ad2..5b8d72dfd3 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -13,4 +13,5 @@
 - [Project users](add-user/add-user.md)
 - [Protected branches](protected_branches.md)
 - [Web Editor](web_editor.md)
+- [Merge Requests](merge_requests.md)
 - ["Work In Progress" Merge Requests](wip_merge_requests.md)
diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md
new file mode 100644
index 0000000000..751e19da7f
--- /dev/null
+++ b/doc/workflow/merge_requests.md
@@ -0,0 +1,40 @@
+# Merge Requests
+
+Merge requests allow you to exchange changes you made to source code
+
+## Checkout merge requests locally
+
+Locate the section for your GitLab remote in the `.git/config` file. It looks like this:
+
+```
+[remote "origin"]
+  url = https://gitlab.com/gitlab-org/gitlab-ce.git
+  fetch = +refs/heads/*:refs/remotes/origin/*
+```
+
+Now add the line `fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*` to this section. 
+
+It should looks like this: 
+
+```
+[remote "origin"]
+  url = https://gitlab.com/gitlab-org/gitlab-ce.git
+  fetch = +refs/heads/*:refs/remotes/origin/*
+  fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
+```
+
+Now you can fetch all the merge requests requests:
+
+```
+$ git fetch origin
+From https://gitlab.com/gitlab-org/gitlab-ce.git
+ * [new ref]         refs/merge-requests/1/head -> origin/merge-requests/1
+ * [new ref]         refs/merge-requests/2/head -> origin/merge-requests/2
+...
+```
+
+To check out a particular merge request:
+
+```
+$ git checkout origin/merge-requests/1
+```
diff --git a/features/steps/dashboard/help.rb b/features/steps/dashboard/help.rb
index 86ab31a58a..800e869533 100644
--- a/features/steps/dashboard/help.rb
+++ b/features/steps/dashboard/help.rb
@@ -16,6 +16,6 @@ class Spinach::Features::DashboardHelp < Spinach::FeatureSteps
   end
 
   step 'Header "Rebuild project satellites" should have correct ids and links' do
-    header_should_have_correct_id_and_link(2, '(Re-)Create satellite repositories', 're-create-satellite-repositories', '.documentation')
+    header_should_have_correct_id_and_link(2, 'Check GitLab configuration', 'check-gitlab-configuration', '.documentation')
   end
 end
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb
index cec8d06ade..28c8c6b601 100644
--- a/features/steps/dashboard/merge_requests.rb
+++ b/features/steps/dashboard/merge_requests.rb
@@ -66,7 +66,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
 
   def authored_merge_request
     @authored_merge_request ||= create :merge_request,
-                                  source_branch: 'simple_merge_request',
+                                  source_branch: 'markdown',
                                   author: current_user,
                                   target_project: project,
                                   source_project: project
@@ -74,14 +74,14 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
 
   def other_merge_request
     @other_merge_request ||= create :merge_request,
-                              source_branch: '2_3_notes_fix',
+                              source_branch: 'fix',
                               target_project: project,
                               source_project: project
   end
 
   def authored_merge_request_from_fork
     @authored_merge_request_from_fork ||= create :merge_request,
-                                            source_branch: 'basic_page',
+                                            source_branch: 'feature_conflict',
                                             author: current_user,
                                             target_project: public_project,
                                             source_project: forked_project
@@ -89,7 +89,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
 
   def assigned_merge_request_from_fork
     @assigned_merge_request_from_fork ||= create :merge_request,
-                                            source_branch: 'basic_page_fix',
+                                            source_branch: 'markdown',
                                             assignee: current_user,
                                             target_project: public_project,
                                             source_project: forked_project
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb
index 3e97e84d11..2a333222fb 100644
--- a/features/steps/project/forked_merge_requests.rb
+++ b/features/steps/project/forked_merge_requests.rb
@@ -9,7 +9,6 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
     @project = Project.find_by(name: "Shop")
     @project ||= create(:project, name: "Shop")
     @project.team << [@user, :reporter]
-    @project.ensure_satellite_exists
   end
 
   step 'I have a project forked off of "Shop" called "Forked Shop"' do
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index a1a26abd8c..f2198f58c1 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -198,15 +198,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'merge request "Bug NS-05" is mergeable' do
-    merge_request.project.satellite.create
     merge_request.mark_as_mergeable
   end
 
   step 'I accept this merge request' do
-    Gitlab::Satellite::MergeAction.any_instance.stub(
-      merge!: true,
-    )
-
     page.within '.mr-state-widget' do
       click_button "Accept Merge Request"
     end
diff --git a/lib/api/files.rb b/lib/api/files.rb
index 83581cd399..308c84dd13 100644
--- a/lib/api/files.rb
+++ b/lib/api/files.rb
@@ -3,6 +3,26 @@ module API
   class Files < Grape::API
     before { authenticate! }
 
+    helpers do
+      def commit_params(attrs)
+        {
+          file_path: attrs[:file_path],
+          current_branch: attrs[:branch_name],
+          target_branch: attrs[:branch_name],
+          commit_message: attrs[:commit_message],
+          file_content: attrs[:content],
+          file_content_encoding: attrs[:encoding]
+        }
+      end
+
+      def commit_response(attrs)
+        {
+          file_path: attrs[:file_path],
+          branch_name: attrs[:branch_name],
+        }
+      end
+    end
+
     resource :projects do
       # Get file from repository
       # File content is Base64 encoded
@@ -73,17 +93,11 @@ module API
 
         required_attributes! [:file_path, :branch_name, :content, :commit_message]
         attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message, :encoding]
-        branch_name = attrs.delete(:branch_name)
-        file_path = attrs.delete(:file_path)
-        result = ::Files::CreateService.new(user_project, current_user, attrs, branch_name, file_path).execute
+        result = ::Files::CreateService.new(user_project, current_user, commit_params(attrs)).execute
 
         if result[:status] == :success
           status(201)
-
-          {
-            file_path: file_path,
-            branch_name: branch_name
-          }
+          commit_response(attrs)
         else
           render_api_error!(result[:message], 400)
         end
@@ -105,17 +119,11 @@ module API
 
         required_attributes! [:file_path, :branch_name, :content, :commit_message]
         attrs = attributes_for_keys [:file_path, :branch_name, :content, :commit_message, :encoding]
-        branch_name = attrs.delete(:branch_name)
-        file_path = attrs.delete(:file_path)
-        result = ::Files::UpdateService.new(user_project, current_user, attrs, branch_name, file_path).execute
+        result = ::Files::UpdateService.new(user_project, current_user, commit_params(attrs)).execute
 
         if result[:status] == :success
           status(200)
-
-          {
-            file_path: file_path,
-            branch_name: branch_name
-          }
+          commit_response(attrs)
         else
           http_status = result[:http_status] || 400
           render_api_error!(result[:message], http_status)
@@ -138,17 +146,11 @@ module API
 
         required_attributes! [:file_path, :branch_name, :commit_message]
         attrs = attributes_for_keys [:file_path, :branch_name, :commit_message]
-        branch_name = attrs.delete(:branch_name)
-        file_path = attrs.delete(:file_path)
-        result = ::Files::DeleteService.new(user_project, current_user, attrs, branch_name, file_path).execute
+        result = ::Files::DeleteService.new(user_project, current_user, commit_params(attrs)).execute
 
         if result[:status] == :success
           status(200)
-
-          {
-            file_path: file_path,
-            branch_name: branch_name
-          }
+          commit_response(attrs)
         else
           render_api_error!(result[:message], 400)
         end
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index ce21c699e8..7412274b04 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -198,7 +198,11 @@ module API
 
           if merge_request.open? && !merge_request.work_in_progress?
             if merge_request.can_be_merged?
-              merge_request.automerge!(current_user, params[:merge_commit_message] || merge_request.merge_commit_message)
+              commit_message = params[:merge_commit_message] || merge_request.merge_commit_message
+
+              ::MergeRequests::MergeService.new(merge_request.target_project, current_user).
+                execute(merge_request, commit_message)
+
               present merge_request, with: Entities::MergeRequest
             else
               render_api_error!('Branch cannot be merged', 405)
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 5fc1862c3e..6108697bc2 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -1,5 +1,4 @@
 require 'gitlab/git'
 
 module Gitlab
-  autoload :Satellite, 'gitlab/satellite/satellite'
 end
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
index 172d4902ad..14ee4701e7 100644
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
@@ -217,20 +217,6 @@ module Gitlab
       FileUtils.mv(full_path(old_name), full_path(new_name))
     end
 
-    # Remove GitLab Satellites for provided path (namespace or repo dir)
-    #
-    # Ex.
-    #   rm_satellites("gitlab")
-    #
-    #   rm_satellites("gitlab/gitlab-ci.git")
-    #
-    def rm_satellites(path)
-      raise ArgumentError.new("Path can't be blank") if path.blank?
-
-      satellites_path = File.join(Gitlab.config.satellites.path, path)
-      FileUtils.rm_r(satellites_path, force: true)
-    end
-
     def url_to_repo(path)
       Gitlab.config.gitlab_shell.ssh_path_prefix + "#{path}.git"
     end
diff --git a/lib/gitlab/satellite/action.rb b/lib/gitlab/satellite/action.rb
deleted file mode 100644
index 489070f1a3..0000000000
--- a/lib/gitlab/satellite/action.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-module Gitlab
-  module Satellite
-    class Action
-      DEFAULT_OPTIONS = { git_timeout: Gitlab.config.satellites.timeout.seconds }
-
-      attr_accessor :options, :project, :user
-
-      def initialize(user, project, options = {})
-        @options = DEFAULT_OPTIONS.merge(options)
-        @project = project
-        @user = user
-      end
-
-      protected
-
-      # * Sets a 30s timeout for Git
-      # * Locks the satellite repo
-      # * Yields the prepared satellite repo
-      def in_locked_and_timed_satellite
-        Gitlab::ShellEnv.set_env(user)
-
-        Grit::Git.with_timeout(options[:git_timeout]) do
-          project.satellite.lock do
-            return yield project.satellite.repo
-          end
-        end
-      rescue Errno::ENOMEM => ex
-        return handle_exception(ex)
-      rescue Grit::Git::GitTimeout => ex
-        return handle_exception(ex)
-      ensure
-        Gitlab::ShellEnv.reset_env
-      end
-
-      # * Recreates the satellite
-      # * Sets up Git variables for the user
-      #
-      # Note: use this within #in_locked_and_timed_satellite
-      def prepare_satellite!(repo)
-        project.satellite.clear_and_update!
-
-        if user
-          repo.config['user.name'] = user.name
-          repo.config['user.email'] = user.email
-        end
-      end
-
-      def default_options(options = {})
-        { raise: true, timeout: true }.merge(options)
-      end
-
-      def handle_exception(exception)
-        Gitlab::GitLogger.error(exception.message)
-        false
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/compare_action.rb b/lib/gitlab/satellite/compare_action.rb
deleted file mode 100644
index 46c98a8f4c..0000000000
--- a/lib/gitlab/satellite/compare_action.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-module Gitlab
-  module Satellite
-    class BranchesWithoutParent < StandardError; end
-
-    class CompareAction < Action
-      def initialize(user, target_project, target_branch, source_project, source_branch)
-        super user, target_project
-
-        @target_project, @target_branch = target_project, target_branch
-        @source_project, @source_branch = source_project, source_branch
-      end
-
-      # Compare 2 repositories and return Gitlab::CompareResult object
-      def result
-        in_locked_and_timed_satellite do |target_repo|
-          prepare_satellite!(target_repo)
-          update_satellite_source_and_target!(target_repo)
-
-          Gitlab::CompareResult.new(compare(target_repo))
-        end
-      rescue Grit::Git::CommandFailed => ex
-        raise BranchesWithoutParent
-      end
-
-      private
-
-      # Assumes a satellite exists that is a fresh clone of the projects repo, prepares satellite for diffs
-      def update_satellite_source_and_target!(target_repo)
-        target_repo.remote_add('source', @source_project.repository.path_to_repo)
-        target_repo.remote_fetch('source')
-      rescue Grit::Git::CommandFailed => ex
-        handle_exception(ex)
-      end
-
-      def compare(repo)
-        @compare ||= Gitlab::Git::Compare.new(
-          Gitlab::Git::Repository.new(repo.path),
-          "origin/#{@target_branch}",
-          "source/#{@source_branch}"
-        )
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/files/delete_file_action.rb b/lib/gitlab/satellite/files/delete_file_action.rb
deleted file mode 100644
index 0d37b9dea8..0000000000
--- a/lib/gitlab/satellite/files/delete_file_action.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require_relative 'file_action'
-
-module Gitlab
-  module Satellite
-    class DeleteFileAction < FileAction
-      # Deletes file and creates a new commit for it
-      #
-      # Returns false if committing the change fails
-      # Returns false if pushing from the satellite to bare repo failed or was rejected
-      # Returns true otherwise
-      def commit!(content, commit_message)
-        in_locked_and_timed_satellite do |repo|
-          prepare_satellite!(repo)
-
-          # create target branch in satellite at the corresponding commit from bare repo
-          repo.git.checkout({ raise: true, timeout: true, b: true }, ref, "origin/#{ref}")
-
-          # update the file in the satellite's working dir
-          file_path_in_satellite = File.join(repo.working_dir, file_path)
-
-          # Prevent relative links
-          unless safe_path?(file_path_in_satellite)
-            Gitlab::GitLogger.error("FileAction: Relative path not allowed")
-            return false
-          end
-
-          File.delete(file_path_in_satellite)
-
-          # add removed file
-          repo.remove(file_path_in_satellite)
-
-          # commit the changes
-          # will raise CommandFailed when commit fails
-          repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
-
-
-          # push commit back to bare repo
-          # will raise CommandFailed when push fails
-          repo.git.push({ raise: true, timeout: true }, :origin, ref)
-
-          # everything worked
-          true
-        end
-      rescue Grit::Git::CommandFailed => ex
-        Gitlab::GitLogger.error(ex.message)
-        false
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/files/edit_file_action.rb b/lib/gitlab/satellite/files/edit_file_action.rb
deleted file mode 100644
index 3cb9c0b5ec..0000000000
--- a/lib/gitlab/satellite/files/edit_file_action.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require_relative 'file_action'
-
-module Gitlab
-  module Satellite
-    # GitLab server-side file update and commit
-    class EditFileAction < FileAction
-      # Updates the files content and creates a new commit for it
-      #
-      # Returns false if the ref has been updated while editing the file
-      # Returns false if committing the change fails
-      # Returns false if pushing from the satellite to bare repo failed or was rejected
-      # Returns true otherwise
-      def commit!(content, commit_message, encoding, new_branch = nil)
-        in_locked_and_timed_satellite do |repo|
-          prepare_satellite!(repo)
-
-          # create target branch in satellite at the corresponding commit from bare repo
-          begin
-            repo.git.checkout({ raise: true, timeout: true, b: true }, ref, "origin/#{ref}")
-          rescue Grit::Git::CommandFailed => ex
-            log_and_raise(CheckoutFailed, ex.message)
-          end
-
-          # update the file in the satellite's working dir
-          file_path_in_satellite = File.join(repo.working_dir, file_path)
-
-          # Prevent relative links
-          unless safe_path?(file_path_in_satellite)
-            Gitlab::GitLogger.error("FileAction: Relative path not allowed")
-            return false
-          end
-
-          # Write file
-          write_file(file_path_in_satellite, content, encoding)
-
-          # commit the changes
-          # will raise CommandFailed when commit fails
-          begin
-            repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
-          rescue Grit::Git::CommandFailed => ex
-            log_and_raise(CommitFailed, ex.message)
-          end
-
-
-          target_branch = new_branch.present? ? "#{ref}:#{new_branch}" : ref
-
-          # push commit back to bare repo
-          # will raise CommandFailed when push fails
-          begin
-            repo.git.push({ raise: true, timeout: true }, :origin, target_branch)
-          rescue Grit::Git::CommandFailed => ex
-            log_and_raise(PushFailed, ex.message)
-          end
-
-          # everything worked
-          true
-        end
-      end
-
-      private
-
-      def log_and_raise(errorClass, message)
-        Gitlab::GitLogger.error(message)
-        raise(errorClass, message)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/files/file_action.rb b/lib/gitlab/satellite/files/file_action.rb
deleted file mode 100644
index 6446b14568..0000000000
--- a/lib/gitlab/satellite/files/file_action.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module Gitlab
-  module Satellite
-    class FileAction < Action
-      attr_accessor :file_path, :ref
-
-      def initialize(user, project, ref, file_path)
-        super user, project
-        @file_path = file_path
-        @ref = ref
-      end
-
-      def safe_path?(path)
-        File.absolute_path(path) == path
-      end
-
-      def write_file(abs_file_path, content, file_encoding = 'text')
-        if file_encoding == 'base64'
-          File.open(abs_file_path, 'wb') { |f| f.write(Base64.decode64(content)) }
-        else
-          File.open(abs_file_path, 'w') { |f| f.write(content) }
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/files/new_file_action.rb b/lib/gitlab/satellite/files/new_file_action.rb
deleted file mode 100644
index 724dfa0d04..0000000000
--- a/lib/gitlab/satellite/files/new_file_action.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require_relative 'file_action'
-
-module Gitlab
-  module Satellite
-    class NewFileAction < FileAction
-      # Updates the files content and creates a new commit for it
-      #
-      # Returns false if the ref has been updated while editing the file
-      # Returns false if committing the change fails
-      # Returns false if pushing from the satellite to bare repo failed or was rejected
-      # Returns true otherwise
-      def commit!(content, commit_message, encoding, new_branch = nil)
-        in_locked_and_timed_satellite do |repo|
-          prepare_satellite!(repo)
-
-          # create target branch in satellite at the corresponding commit from bare repo
-          current_ref =
-            if @project.empty_repo?
-              # skip this step if we want to add first file to empty repo
-              Satellite::PARKING_BRANCH
-            else
-              repo.git.checkout({ raise: true, timeout: true, b: true }, ref, "origin/#{ref}")
-              ref
-            end
-
-          file_path_in_satellite = File.join(repo.working_dir, file_path)
-          dir_name_in_satellite = File.dirname(file_path_in_satellite)
-
-          # Prevent relative links
-          unless safe_path?(file_path_in_satellite)
-            Gitlab::GitLogger.error("FileAction: Relative path not allowed")
-            return false
-          end
-
-          # Create dir if not exists
-          FileUtils.mkdir_p(dir_name_in_satellite)
-
-          # Write file
-          write_file(file_path_in_satellite, content, encoding)
-
-          # add new file
-          repo.add(file_path_in_satellite)
-
-          # commit the changes
-          # will raise CommandFailed when commit fails
-          repo.git.commit(raise: true, timeout: true, a: true, m: commit_message)
-
-          target_branch = if new_branch.present? && !@project.empty_repo?
-                            "#{ref}:#{new_branch}"
-                          else
-                            "#{current_ref}:#{ref}"
-                          end
-
-          # push commit back to bare repo
-          # will raise CommandFailed when push fails
-          repo.git.push({ raise: true, timeout: true }, :origin, target_branch)
-
-          # everything worked
-          true
-        end
-      rescue Grit::Git::CommandFailed => ex
-        Gitlab::GitLogger.error(ex.message)
-        false
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/logger.rb b/lib/gitlab/satellite/logger.rb
deleted file mode 100644
index 6f3f8255ac..0000000000
--- a/lib/gitlab/satellite/logger.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Gitlab
-  module Satellite
-    class Logger < Gitlab::Logger
-      def self.file_name
-        'satellites.log'
-      end
-
-      def format_message(severity, timestamp, progname, msg)
-        "#{timestamp.to_s(:long)}: #{msg}\n"
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb
deleted file mode 100644
index f9bf286697..0000000000
--- a/lib/gitlab/satellite/merge_action.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-module Gitlab
-  module Satellite
-    # GitLab server-side merge
-    class MergeAction < Action
-      attr_accessor :merge_request
-
-      def initialize(user, merge_request)
-        super user, merge_request.target_project
-        @merge_request = merge_request
-      end
-
-      # Checks if a merge request can be executed without user interaction
-      def can_be_merged?
-        in_locked_and_timed_satellite do |merge_repo|
-          prepare_satellite!(merge_repo)
-          merge_in_satellite!(merge_repo)
-        end
-      end
-
-      # Merges the source branch into the target branch in the satellite and
-      # pushes it back to the repository.
-      # It also removes the source branch if requested in the merge request (and this is permitted by the merge request).
-      #
-      # Returns false if the merge produced conflicts
-      # Returns false if pushing from the satellite to the repository failed or was rejected
-      # Returns true otherwise
-      def merge!(merge_commit_message = nil)
-        in_locked_and_timed_satellite do |merge_repo|
-          prepare_satellite!(merge_repo)
-          if merge_in_satellite!(merge_repo, merge_commit_message)
-            # push merge back to bare repo
-            # will raise CommandFailed when push fails
-            merge_repo.git.push(default_options, :origin, merge_request.target_branch)
-
-            # remove source branch
-            if merge_request.remove_source_branch?
-              # will raise CommandFailed when push fails
-              merge_repo.git.push(default_options, :origin, ":#{merge_request.source_branch}")
-            end
-            # merge, push and branch removal successful
-            true
-          end
-        end
-      rescue Grit::Git::CommandFailed => ex
-        handle_exception(ex)
-      end
-
-      def diff_in_satellite
-        in_locked_and_timed_satellite do |merge_repo|
-          prepare_satellite!(merge_repo)
-          update_satellite_source_and_target!(merge_repo)
-
-          # Only show what is new in the source branch compared to the target branch, not the other way around.
-          # The line below with merge_base is equivalent to diff with three dots (git diff branch1...branch2)
-          # From the git documentation: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"
-          common_commit = merge_repo.git.native(:merge_base, default_options, ["origin/#{merge_request.target_branch}", "source/#{merge_request.source_branch}"]).strip
-          merge_repo.git.native(:diff, default_options, common_commit, "source/#{merge_request.source_branch}")
-        end
-      rescue Grit::Git::CommandFailed => ex
-        handle_exception(ex)
-      end
-
-      def diffs_between_satellite
-        in_locked_and_timed_satellite do |merge_repo|
-          prepare_satellite!(merge_repo)
-          update_satellite_source_and_target!(merge_repo)
-          if merge_request.for_fork?
-            repository = Gitlab::Git::Repository.new(merge_repo.path)
-            diffs = Gitlab::Git::Diff.between(
-              repository,
-              "source/#{merge_request.source_branch}",
-              "origin/#{merge_request.target_branch}"
-            )
-          else
-            raise "Attempt to determine diffs between for a non forked merge request in satellite MergeRequest.id:[#{merge_request.id}]"
-          end
-
-          return diffs
-        end
-      rescue Grit::Git::CommandFailed => ex
-        handle_exception(ex)
-      end
-
-      # Get commit as an email patch
-      def format_patch
-        in_locked_and_timed_satellite do |merge_repo|
-          prepare_satellite!(merge_repo)
-          update_satellite_source_and_target!(merge_repo)
-          patch = merge_repo.git.format_patch(default_options({ stdout: true }), "origin/#{merge_request.target_branch}..source/#{merge_request.source_branch}")
-        end
-      rescue Grit::Git::CommandFailed => ex
-        handle_exception(ex)
-      end
-
-      # Retrieve an array of commits between the source and the target
-      def commits_between
-        in_locked_and_timed_satellite do |merge_repo|
-          prepare_satellite!(merge_repo)
-          update_satellite_source_and_target!(merge_repo)
-          if merge_request.for_fork?
-            repository = Gitlab::Git::Repository.new(merge_repo.path)
-            commits = Gitlab::Git::Commit.between(
-              repository,
-              "origin/#{merge_request.target_branch}",
-              "source/#{merge_request.source_branch}"
-            )
-          else
-            raise "Attempt to determine commits between for a non forked merge request in satellite MergeRequest.id:[#{merge_request.id}]"
-          end
-
-          return commits
-        end
-      rescue Grit::Git::CommandFailed => ex
-        handle_exception(ex)
-      end
-
-      private
-      # Merges the source_branch into the target_branch in the satellite.
-      #
-      # Note: it will clear out the satellite before doing anything
-      #
-      # Returns false if the merge produced conflicts
-      # Returns true otherwise
-      def merge_in_satellite!(repo, message = nil)
-        update_satellite_source_and_target!(repo)
-
-        message ||= "Merge branch '#{merge_request.source_branch}' into '#{merge_request.target_branch}'"
-
-        # merge the source branch into the satellite
-        # will raise CommandFailed when merge fails
-        repo.git.merge(default_options({ no_ff: true }), "-m#{message}", "source/#{merge_request.source_branch}")
-      rescue Grit::Git::CommandFailed => ex
-        handle_exception(ex)
-      end
-
-      # Assumes a satellite exists that is a fresh clone of the projects repo, prepares satellite for merges, diffs etc
-      def update_satellite_source_and_target!(repo)
-        repo.remote_add('source', merge_request.source_project.repository.path_to_repo)
-        repo.remote_fetch('source')
-        repo.git.checkout(default_options({ b: true }), merge_request.target_branch, "origin/#{merge_request.target_branch}")
-      rescue Grit::Git::CommandFailed => ex
-        handle_exception(ex)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb
deleted file mode 100644
index 398643d68d..0000000000
--- a/lib/gitlab/satellite/satellite.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-module Gitlab
-  module Satellite
-    autoload :DeleteFileAction, 'gitlab/satellite/files/delete_file_action'
-    autoload :EditFileAction,   'gitlab/satellite/files/edit_file_action'
-    autoload :FileAction,       'gitlab/satellite/files/file_action'
-    autoload :NewFileAction,    'gitlab/satellite/files/new_file_action'
-
-    class CheckoutFailed < StandardError; end
-    class CommitFailed < StandardError; end
-    class PushFailed < StandardError; end
-
-    class Satellite
-      include Gitlab::Popen
-
-      PARKING_BRANCH = "__parking_branch"
-
-      attr_accessor :project
-
-      def initialize(project)
-        @project = project
-      end
-
-      def log(message)
-        Gitlab::Satellite::Logger.error(message)
-      end
-
-      def clear_and_update!
-        project.ensure_satellite_exists
-
-        @repo = nil
-        clear_working_dir!
-        delete_heads!
-        remove_remotes!
-        update_from_source!
-      end
-
-      def create
-        output, status = popen(%W(git clone -- #{project.repository.path_to_repo} #{path}),
-                               Gitlab.config.satellites.path)
-
-        log("PID: #{project.id}: git clone #{project.repository.path_to_repo} #{path}")
-        log("PID: #{project.id}: -> #{output}")
-
-        if status.zero?
-          true
-        else
-          log("Failed to create satellite for #{project.name_with_namespace}")
-          false
-        end
-      end
-
-      def exists?
-        File.exists? path
-      end
-
-      # * Locks the satellite
-      # * Changes the current directory to the satellite's working dir
-      # * Yields
-      def lock
-        project.ensure_satellite_exists
-
-        File.open(lock_file, "w+") do |f|
-          begin
-            f.flock File::LOCK_EX
-            yield
-          ensure
-            f.flock File::LOCK_UN
-          end
-        end
-      end
-
-      def lock_file
-        create_locks_dir unless File.exists?(lock_files_dir)
-        File.join(lock_files_dir, "satellite_#{project.id}.lock")
-      end
-
-      def path
-        File.join(Gitlab.config.satellites.path, project.path_with_namespace)
-      end
-
-      def repo
-        project.ensure_satellite_exists
-
-        @repo ||= Grit::Repo.new(path)
-      end
-
-      def destroy
-        FileUtils.rm_rf(path)
-      end
-
-      private
-
-      # Clear the working directory
-      def clear_working_dir!
-        repo.git.reset(hard: true)
-        repo.git.clean(f: true, d: true, x: true)
-      end
-
-      # Deletes all branches except the parking branch
-      #
-      # This ensures we have no name clashes or issues updating branches when
-      # working with the satellite.
-      def delete_heads!
-        heads = repo.heads.map(&:name)
-
-        # update or create the parking branch
-        repo.git.checkout(default_options({ B: true }), PARKING_BRANCH)
-
-        # remove the parking branch from the list of heads ...
-        heads.delete(PARKING_BRANCH)
-        # ... and delete all others
-        heads.each { |head| repo.git.branch(default_options({ D: true }), head) }
-      end
-
-      # Deletes all remotes except origin
-      #
-      # This ensures we have no remote name clashes or issues updating branches when
-      # working with the satellite.
-      def remove_remotes!
-        remotes = repo.git.remote.split(' ')
-        remotes.delete('origin')
-        remotes.each { |name| repo.git.remote(default_options,'rm', name)}
-      end
-
-      # Updates the satellite from bare repo
-      #
-      # Note: this will only update remote branches (i.e. origin/*)
-      def update_from_source!
-        repo.git.remote(default_options, 'set-url', :origin, project.repository.path_to_repo)
-        repo.git.fetch(default_options, :origin)
-      end
-
-      def default_options(options = {})
-        { raise: true, timeout: true }.merge(options)
-      end
-
-      # Create directory for storing
-      # satellites lock files
-      def create_locks_dir
-        FileUtils.mkdir_p(lock_files_dir)
-      end
-
-      def lock_files_dir
-        @lock_files_dir ||= File.join(Gitlab.config.satellites.path, "tmp")
-      end
-    end
-  end
-end
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index badb47c677..8acb6a7fd1 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -25,7 +25,6 @@ namespace :gitlab do
       check_init_script_exists
       check_init_script_up_to_date
       check_projects_have_namespace
-      check_satellites_exist
       check_redis_version
       check_ruby_version
       check_git_version
@@ -238,37 +237,6 @@ namespace :gitlab do
       end
     end
 
-    def check_satellites_exist
-      print "Projects have satellites? ... "
-
-      unless Project.count > 0
-        puts "can't check, you have no projects".magenta
-        return
-      end
-      puts ""
-
-      Project.find_each(batch_size: 100) do |project|
-        print sanitized_message(project)
-
-        if project.satellite.exists?
-          puts "yes".green
-        elsif project.empty_repo?
-          puts "can't create, repository is empty".magenta
-        else
-          puts "no".red
-          try_fixing_it(
-            sudo_gitlab("bundle exec rake gitlab:satellites:create RAILS_ENV=production"),
-            "If necessary, remove the tmp/repo_satellites directory ...",
-            "... and rerun the above command"
-          )
-          for_more_information(
-            "doc/raketasks/maintenance.md "
-          )
-          fix_and_rerun
-        end
-      end
-    end
-
     def check_log_writable
       print "Log directory writable? ... "
 
@@ -339,7 +307,6 @@ namespace :gitlab do
       check_repo_base_is_not_symlink
       check_repo_base_user_and_group
       check_repo_base_permissions
-      check_satellites_permissions
       check_repos_hooks_directory_is_link
       check_gitlab_shell_self_test
 
@@ -417,29 +384,6 @@ namespace :gitlab do
       end
     end
 
-    def check_satellites_permissions
-      print "Satellites access is drwxr-x---? ... "
-
-      satellites_path = Gitlab.config.satellites.path
-      unless File.exists?(satellites_path)
-        puts "can't check because of previous errors".magenta
-        return
-      end
-
-      if File.stat(satellites_path).mode.to_s(8).ends_with?("0750")
-        puts "yes".green
-      else
-        puts "no".red
-        try_fixing_it(
-          "sudo chmod u+rwx,g=rx,o-rwx #{satellites_path}",
-        )
-        for_more_information(
-          see_installation_guide_section "GitLab"
-        )
-        fix_and_rerun
-      end
-    end
-
     def check_repo_base_user_and_group
       gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user
       gitlab_shell_owner_group = Gitlab.config.gitlab_shell.owner_group
diff --git a/lib/tasks/gitlab/enable_automerge.rake b/lib/tasks/gitlab/enable_automerge.rake
deleted file mode 100644
index 3dade9d75b..0000000000
--- a/lib/tasks/gitlab/enable_automerge.rake
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace :gitlab do
-  namespace :satellites do
-    desc "GitLab | Create satellite repos"
-    task create: :environment do
-      create_satellites
-    end
-  end
-
-  def create_satellites
-    warn_user_is_not_gitlab
-
-    print "Creating satellites for ..."
-    unless Project.count > 0
-      puts "skipping, because you have no projects".magenta
-      return
-    end
-    puts ""
-
-    Project.find_each(batch_size: 100) do |project|
-      print "#{project.name_with_namespace.yellow} ... "
-
-      unless project.repo_exists?
-        puts "skipping, because the repo is empty".magenta
-        next
-      end
-
-      if project.satellite.exists?
-        puts "exists already".green
-      else
-        print "\n... "
-        if project.satellite.create
-          puts "created".green
-        else
-          puts "error".red
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/reference_extractor_spec.rb b/spec/lib/gitlab/reference_extractor_spec.rb
index f921dd9cc0..088e34f050 100644
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
@@ -25,7 +25,7 @@ describe Gitlab::ReferenceExtractor do
     project.team << [@u_bar, :guest]
 
     subject.analyze(%Q{
-      Inline code: `@foo` 
+      Inline code: `@foo`
 
       Code block:
 
@@ -33,7 +33,7 @@ describe Gitlab::ReferenceExtractor do
       @bar
       ```
 
-      Quote: 
+      Quote:
 
       > @offteam
     })
@@ -49,8 +49,8 @@ describe Gitlab::ReferenceExtractor do
   end
 
   it 'accesses valid merge requests' do
-    @m0 = create(:merge_request, source_project: project, target_project: project, source_branch: 'aaa')
-    @m1 = create(:merge_request, source_project: project, target_project: project, source_branch: 'bbb')
+    @m0 = create(:merge_request, source_project: project, target_project: project, source_branch: 'markdown')
+    @m1 = create(:merge_request, source_project: project, target_project: project, source_branch: 'feature_conflict')
 
     subject.analyze("!999, !#{@m1.iid}, and !#{@m0.iid}.")
     expect(subject.merge_requests).to eq([@m1, @m0])
diff --git a/spec/lib/gitlab/satellite/action_spec.rb b/spec/lib/gitlab/satellite/action_spec.rb
deleted file mode 100644
index 0a93676edc..0000000000
--- a/spec/lib/gitlab/satellite/action_spec.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-require 'spec_helper'
-
-describe 'Gitlab::Satellite::Action' do
-  let(:project) { create(:project) }
-  let(:user) { create(:user) }
-
-  describe '#prepare_satellite!' do
-    it 'should be able to fetch timeout from conf' do
-      expect(Gitlab::Satellite::Action::DEFAULT_OPTIONS[:git_timeout]).to eq(30.seconds)
-    end
-
-    it 'create a repository with a parking branch and one remote: origin' do
-      repo = project.satellite.repo
-
-      #now lets dirty it up
-
-      starting_remote_count = repo.git.list_remotes.size
-      expect(starting_remote_count).to be >= 1
-      #kind of hookey way to add a second remote
-      origin_uri = repo.git.remote({ v: true }).split(" ")[1]
-
-      repo.git.remote({ raise: true }, 'add', 'another-remote', origin_uri)
-      repo.git.branch({ raise: true }, 'a-new-branch')
-
-      expect(repo.heads.size).to be > (starting_remote_count)
-      expect(repo.git.remote().split(" ").size).to be > (starting_remote_count)
-
-      repo.git.config({}, "user.name", "#{user.name} -- foo")
-      repo.git.config({}, "user.email", "#{user.email} -- foo")
-      expect(repo.config['user.name']).to eq("#{user.name} -- foo")
-      expect(repo.config['user.email']).to eq("#{user.email} -- foo")
-
-
-      #These must happen in the context of the satellite directory...
-      satellite_action = Gitlab::Satellite::Action.new(user, project)
-      project.satellite.lock do
-        #Now clean it up, use send to get around prepare_satellite! being protected
-        satellite_action.send(:prepare_satellite!, repo)
-      end
-
-      #verify it's clean
-      heads = repo.heads.map(&:name)
-      expect(heads.size).to eq(1)
-      expect(heads.include?(Gitlab::Satellite::Satellite::PARKING_BRANCH)).to eq(true)
-      remotes = repo.git.remote().split(' ')
-      expect(remotes.size).to eq(1)
-      expect(remotes.include?('origin')).to eq(true)
-      expect(repo.config['user.name']).to eq(user.name)
-      expect(repo.config['user.email']).to eq(user.email)
-    end
-  end
-
-  describe '#in_locked_and_timed_satellite' do
-
-    it 'should make use of a lockfile' do
-      repo = project.satellite.repo
-      called = false
-
-      #set assumptions
-      FileUtils.rm_f(project.satellite.lock_file)
-
-      expect(File.exists?(project.satellite.lock_file)).to be_falsey
-
-      satellite_action = Gitlab::Satellite::Action.new(user, project)
-      satellite_action.send(:in_locked_and_timed_satellite) do |sat_repo|
-        expect(repo).to eq(sat_repo)
-        expect(File.exists? project.satellite.lock_file).to be_truthy
-        called = true
-      end
-
-      expect(called).to be_truthy
-
-    end
-
-    it 'should be able to use the satellite after locking' do
-      repo = project.satellite.repo
-      called = false
-
-      # Set base assumptions
-      if File.exists? project.satellite.lock_file
-        expect(FileLockStatusChecker.new(project.satellite.lock_file).flocked?).to be_falsey
-      end
-
-      satellite_action = Gitlab::Satellite::Action.new(user, project)
-      satellite_action.send(:in_locked_and_timed_satellite) do |sat_repo|
-        called = true
-        expect(repo).to eq(sat_repo)
-        expect(File.exists? project.satellite.lock_file).to be_truthy
-        expect(FileLockStatusChecker.new(project.satellite.lock_file).flocked?).to be_truthy
-      end
-
-      expect(called).to be_truthy
-      expect(FileLockStatusChecker.new(project.satellite.lock_file).flocked?).to be_falsey
-
-    end
-
-    class FileLockStatusChecker < File
-      def flocked?(&block)
-        status = flock LOCK_EX|LOCK_NB
-        case status
-        when false
-          return true
-        when 0
-          begin
-            block ? block.call : false
-          ensure
-            flock LOCK_UN
-          end
-        else
-          raise SystemCallError, status
-        end
-      end
-    end
-
-  end
-end
diff --git a/spec/lib/gitlab/satellite/merge_action_spec.rb b/spec/lib/gitlab/satellite/merge_action_spec.rb
deleted file mode 100644
index 9b1c9a34e2..0000000000
--- a/spec/lib/gitlab/satellite/merge_action_spec.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-require 'spec_helper'
-
-describe 'Gitlab::Satellite::MergeAction' do
-  include RepoHelpers
-
-  let(:project) { create(:project, namespace: create(:group)) }
-  let(:fork_project) { create(:project, namespace: create(:group), forked_from_project: project) }
-  let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
-  let(:merge_request_fork) { create(:merge_request, source_project: fork_project, target_project: project) }
-
-  let(:merge_request_with_conflict) { create(:merge_request, :conflict, source_project: project, target_project: project) }
-  let(:merge_request_fork_with_conflict) { create(:merge_request, :conflict, source_project: project, target_project: project) }
-
-  describe '#commits_between' do
-    def verify_commits(commits, first_commit_sha, last_commit_sha)
-      commits.each { |commit| expect(commit.class).to eq(Gitlab::Git::Commit) }
-      expect(commits.first.id).to eq(first_commit_sha)
-      expect(commits.last.id).to eq(last_commit_sha)
-    end
-
-    context 'on fork' do
-      it 'should get proper commits between' do
-        commits = Gitlab::Satellite::MergeAction.new(merge_request_fork.author, merge_request_fork).commits_between
-        verify_commits(commits, sample_compare.commits.first, sample_compare.commits.last)
-      end
-    end
-
-    context 'between branches' do
-      it 'should raise exception -- not expected to be used by non forks' do
-        expect { Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).commits_between }.to raise_error(RuntimeError)
-      end
-    end
-  end
-
-  describe '#format_patch' do
-    def verify_content(patch)
-      sample_compare.commits.each do |commit|
-        expect(patch.include?(commit)).to be_truthy
-      end
-    end
-
-    context 'on fork' do
-      it 'should build a format patch' do
-        patch = Gitlab::Satellite::MergeAction.new(merge_request_fork.author, merge_request_fork).format_patch
-        verify_content(patch)
-      end
-    end
-
-    context 'between branches' do
-      it 'should build a format patch' do
-        patch = Gitlab::Satellite::MergeAction.new(merge_request_fork.author, merge_request).format_patch
-        verify_content(patch)
-      end
-    end
-  end
-
-  describe '#diffs_between_satellite tested against diff_in_satellite' do
-    def is_a_matching_diff(diff, diffs)
-      diff_count = diff.scan('diff --git').size
-      expect(diff_count).to be >= 1
-      expect(diffs.size).to eq(diff_count)
-      diffs.each do |a_diff|
-        expect(a_diff.class).to eq(Gitlab::Git::Diff)
-        expect(diff.include? a_diff.diff).to be_truthy
-      end
-    end
-
-    context 'on fork' do
-      it 'should get proper diffs' do
-        diffs = Gitlab::Satellite::MergeAction.new(merge_request_fork.author, merge_request_fork).diffs_between_satellite
-        diff = Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request_fork).diff_in_satellite
-        is_a_matching_diff(diff, diffs)
-      end
-    end
-
-    context 'between branches' do
-      it 'should get proper diffs' do
-        expect{ Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).diffs_between_satellite }.to raise_error(RuntimeError)
-      end
-    end
-  end
-
-  describe '#can_be_merged?' do
-    context 'on fork' do
-      it do
-        expect(Gitlab::Satellite::MergeAction.new(merge_request_fork.author, merge_request_fork).can_be_merged?).to be_truthy
-      end
-
-      it do
-        expect(Gitlab::Satellite::MergeAction.new(merge_request_fork_with_conflict.author, merge_request_fork_with_conflict).can_be_merged?).to be_falsey
-      end
-    end
-
-    context 'between branches' do
-      it do
-        expect(Gitlab::Satellite::MergeAction.new(merge_request.author, merge_request).can_be_merged?).to be_truthy
-      end
-
-      it do
-        expect(Gitlab::Satellite::MergeAction.new(merge_request_with_conflict.author, merge_request_with_conflict).can_be_merged?).to be_falsey
-      end
-    end
-  end
-end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 76f6d8c54c..b91687bc09 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -165,7 +165,7 @@ describe MergeRequest do
   end
 
   it_behaves_like 'an editable mentionable' do
-    subject { create(:merge_request, source_project: project) }
+    subject { create(:merge_request) }
 
     let(:backref_text) { "merge request #{subject.to_reference}" }
     let(:set_mentionable_text) { ->(txt){ subject.description = txt } }
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index 69466b11f0..97b60e19e4 100644
--- a/spec/models/project_services/slack_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.rb
@@ -67,7 +67,7 @@ describe SlackService do
       opts = {
         title: 'Awesome merge_request',
         description: 'please fix',
-        source_branch: 'stable',
+        source_branch: 'feature',
         target_branch: 'master'
       }
       merge_service = MergeRequests::CreateService.new(project,
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 5d40754d59..2fcbd5ae10 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -91,7 +91,6 @@ describe Project do
   describe 'Respond to' do
     it { is_expected.to respond_to(:url_to_repo) }
     it { is_expected.to respond_to(:repo_exists?) }
-    it { is_expected.to respond_to(:satellite) }
     it { is_expected.to respond_to(:update_merge_requests) }
     it { is_expected.to respond_to(:execute_hooks) }
     it { is_expected.to respond_to(:name_with_namespace) }
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 0927cde61a..d96244f23e 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -34,6 +34,20 @@ describe Repository do
     end
   end
 
+  describe :can_be_merged? do
+    context 'mergeable branches' do
+      subject { repository.can_be_merged?('0b4bc9a49b562e85de7cc9e834518ea6828729b9', 'master') }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'non-mergeable branches' do
+      subject { repository.can_be_merged?('bb5206fee213d983da88c47f9cf4cc6caf9c66dc', 'feature') }
+
+      it { is_expected.to be_falsey }
+    end
+  end
+
   describe "search_files" do
     let(:results) { repository.search_files('feature', 'master') }
     subject { results }
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index 78f2cb56b0..042e635256 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -49,8 +49,6 @@ describe API::API, api: true  do
     end
 
     it "should create a new file in project repo" do
-      expect_any_instance_of(Gitlab::Satellite::NewFileAction).to receive(:commit!).and_return(true)
-
       post api("/projects/#{project.id}/repository/files", user), valid_params
       expect(response.status).to eq(201)
       expect(json_response['file_path']).to eq('newfile.rb')
@@ -61,8 +59,9 @@ describe API::API, api: true  do
       expect(response.status).to eq(400)
     end
 
-    it "should return a 400 if satellite fails to create file" do
-      expect_any_instance_of(Gitlab::Satellite::NewFileAction).to receive(:commit!).and_return(false)
+    it "should return a 400 if editor fails to create file" do
+      allow_any_instance_of(Repository).to receive(:commit_file).
+        and_return(false)
 
       post api("/projects/#{project.id}/repository/files", user), valid_params
       expect(response.status).to eq(400)
@@ -80,8 +79,6 @@ describe API::API, api: true  do
     end
 
     it "should update existing file in project repo" do
-      expect_any_instance_of(Gitlab::Satellite::EditFileAction).to receive(:commit!).and_return(true)
-
       put api("/projects/#{project.id}/repository/files", user), valid_params
       expect(response.status).to eq(200)
       expect(json_response['file_path']).to eq(file_path)
@@ -91,32 +88,6 @@ describe API::API, api: true  do
       put api("/projects/#{project.id}/repository/files", user)
       expect(response.status).to eq(400)
     end
-
-    it 'should return a 400 if the checkout fails' do
-      expect_any_instance_of(Gitlab::Satellite::EditFileAction).to receive(:commit!).and_raise(Gitlab::Satellite::CheckoutFailed)
-
-      put api("/projects/#{project.id}/repository/files", user), valid_params
-      expect(response.status).to eq(400)
-
-      ref = valid_params[:branch_name]
-      expect(response.body).to match("ref '#{ref}' could not be checked out")
-    end
-
-    it 'should return a 409 if the file was not modified' do
-      expect_any_instance_of(Gitlab::Satellite::EditFileAction).to receive(:commit!).and_raise(Gitlab::Satellite::CommitFailed)
-
-      put api("/projects/#{project.id}/repository/files", user), valid_params
-      expect(response.status).to eq(409)
-      expect(response.body).to match("Maybe there was nothing to commit?")
-    end
-
-    it 'should return a 409 if the push fails' do
-      expect_any_instance_of(Gitlab::Satellite::EditFileAction).to receive(:commit!).and_raise(Gitlab::Satellite::PushFailed)
-
-      put api("/projects/#{project.id}/repository/files", user), valid_params
-      expect(response.status).to eq(409)
-      expect(response.body).to match("Maybe the file was changed by another process?")
-    end
   end
 
   describe "DELETE /projects/:id/repository/files" do
@@ -129,7 +100,6 @@ describe API::API, api: true  do
     end
 
     it "should delete existing file in project repo" do
-      expect_any_instance_of(Gitlab::Satellite::DeleteFileAction).to receive(:commit!).and_return(true)
       delete api("/projects/#{project.id}/repository/files", user), valid_params
       expect(response.status).to eq(200)
       expect(json_response['file_path']).to eq(file_path)
@@ -140,8 +110,8 @@ describe API::API, api: true  do
       expect(response.status).to eq(400)
     end
 
-    it "should return a 400 if satellite fails to create file" do
-      expect_any_instance_of(Gitlab::Satellite::DeleteFileAction).to receive(:commit!).and_return(false)
+    it "should return a 400 if fails to create file" do
+      allow_any_instance_of(Repository).to receive(:remove_file).and_return(false)
 
       delete api("/projects/#{project.id}/repository/files", user), valid_params
       expect(response.status).to eq(400)
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 29db035b2d..942768fa25 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -148,7 +148,7 @@ describe API::API, api: true  do
       it "should return merge_request" do
         post api("/projects/#{project.id}/merge_requests", user),
              title: 'Test merge_request',
-             source_branch: 'stable',
+             source_branch: 'feature_conflict',
              target_branch: 'master',
              author: user,
              labels: 'label, label2'
@@ -171,20 +171,20 @@ describe API::API, api: true  do
 
       it "should return 400 when target_branch is missing" do
         post api("/projects/#{project.id}/merge_requests", user),
-        title: "Test merge_request", source_branch: "stable", author: user
+        title: "Test merge_request", source_branch: "markdown", author: user
         expect(response.status).to eq(400)
       end
 
       it "should return 400 when title is missing" do
         post api("/projects/#{project.id}/merge_requests", user),
-        target_branch: 'master', source_branch: 'stable'
+        target_branch: 'master', source_branch: 'markdown'
         expect(response.status).to eq(400)
       end
 
       it 'should return 400 on invalid label names' do
         post api("/projects/#{project.id}/merge_requests", user),
              title: 'Test merge_request',
-             source_branch: 'stable',
+             source_branch: 'markdown',
              target_branch: 'master',
              author: user,
              labels: 'label, ?'
@@ -198,7 +198,7 @@ describe API::API, api: true  do
         before do
           post api("/projects/#{project.id}/merge_requests", user),
                title: 'Test merge_request',
-               source_branch: 'stable',
+               source_branch: 'feature_conflict',
                target_branch: 'master',
                author: user
           @mr = MergeRequest.all.last
@@ -208,7 +208,7 @@ describe API::API, api: true  do
           expect do
             post api("/projects/#{project.id}/merge_requests", user),
                  title: 'New test merge_request',
-                 source_branch: 'stable',
+                 source_branch: 'feature_conflict',
                  target_branch: 'master',
                  author: user
           end.to change { MergeRequest.count }.by(0)
@@ -228,7 +228,8 @@ describe API::API, api: true  do
 
       it "should return merge_request" do
         post api("/projects/#{fork_project.id}/merge_requests", user2),
-        title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user2, target_project_id: project.id, description: 'Test description for Test merge_request'
+          title: 'Test merge_request', source_branch: "feature_conflict", target_branch: "master",
+          author: user2, target_project_id: project.id, description: 'Test description for Test merge_request'
         expect(response.status).to eq(201)
         expect(json_response['title']).to eq('Test merge_request')
         expect(json_response['description']).to eq('Test description for Test merge_request')
@@ -258,7 +259,7 @@ describe API::API, api: true  do
 
       it "should return 400 when title is missing" do
         post api("/projects/#{fork_project.id}/merge_requests", user2),
-        target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: project.id
+        target_branch: 'master', source_branch: 'markdown', author: user2, target_project_id: project.id
         expect(response.status).to eq(400)
       end
 
@@ -267,7 +268,7 @@ describe API::API, api: true  do
           post api("/projects/#{project.id}/merge_requests", user),
                title: 'Test merge_request',
                target_branch: 'master',
-               source_branch: 'stable',
+               source_branch: 'markdown',
                author: user,
                target_project_id: fork_project.id
           expect(response.status).to eq(422)
@@ -277,7 +278,7 @@ describe API::API, api: true  do
           post api("/projects/#{fork_project.id}/merge_requests", user2),
                title: 'Test merge_request',
                target_branch: 'master',
-               source_branch: 'stable',
+               source_branch: 'markdown',
                author: user2,
                target_project_id: unrelated_project.id
           expect(response.status).to eq(422)
@@ -286,7 +287,7 @@ describe API::API, api: true  do
 
       it "should return 201 when target_branch is specified and for the same project" do
         post api("/projects/#{fork_project.id}/merge_requests", user2),
-        title: 'Test merge_request', target_branch: 'master', source_branch: 'stable', author: user2, target_project_id: fork_project.id
+        title: 'Test merge_request', target_branch: 'master', source_branch: 'markdown', author: user2, target_project_id: fork_project.id
         expect(response.status).to eq(201)
       end
     end
@@ -302,9 +303,6 @@ describe API::API, api: true  do
 
   describe "PUT /projects/:id/merge_request/:merge_request_id/merge" do
     it "should return merge_request in case of success" do
-      allow_any_instance_of(MergeRequest).
-        to receive_messages(can_be_merged?: true, automerge!: true)
-
       put api("/projects/#{project.id}/merge_request/#{merge_request.id}/merge", user)
 
       expect(response.status).to eq(200)
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 0040718d9b..82f62a8709 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -210,8 +210,8 @@ end
 
 #               diffs_namespace_project_merge_request GET      /:namespace_id/:project_id/merge_requests/:id/diffs(.:format)               projects/merge_requests#diffs
 #             commits_namespace_project_merge_request GET      /:namespace_id/:project_id/merge_requests/:id/commits(.:format)             projects/merge_requests#commits
-#           automerge_namespace_project_merge_request POST     /:namespace_id/:project_id/merge_requests/:id/automerge(.:format)           projects/merge_requests#automerge
-#     automerge_check_namespace_project_merge_request GET      /:namespace_id/:project_id/merge_requests/:id/automerge_check(.:format)     projects/merge_requests#automerge_check
+#           merge_namespace_project_merge_request POST     /:namespace_id/:project_id/merge_requests/:id/merge(.:format)           projects/merge_requests#merge
+#     merge_check_namespace_project_merge_request GET      /:namespace_id/:project_id/merge_requests/:id/merge_check(.:format)     projects/merge_requests#merge_check
 #           ci_status_namespace_project_merge_request GET      /:namespace_id/:project_id/merge_requests/:id/ci_status(.:format)           projects/merge_requests#ci_status
 # toggle_subscription_namespace_project_merge_request POST     /:namespace_id/:project_id/merge_requests/:id/toggle_subscription(.:format) projects/merge_requests#toggle_subscription
 #        branch_from_namespace_project_merge_requests GET      /:namespace_id/:project_id/merge_requests/branch_from(.:format)             projects/merge_requests#branch_from
@@ -233,15 +233,15 @@ describe Projects::MergeRequestsController, 'routing' do
     expect(get('/gitlab/gitlabhq/merge_requests/1/commits')).to route_to('projects/merge_requests#commits', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
   end
 
-  it 'to #automerge' do
-    expect(post('/gitlab/gitlabhq/merge_requests/1/automerge')).to route_to(
-      'projects/merge_requests#automerge',
+  it 'to #merge' do
+    expect(post('/gitlab/gitlabhq/merge_requests/1/merge')).to route_to(
+      'projects/merge_requests#merge',
       namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1'
     )
   end
 
-  it 'to #automerge_check' do
-    expect(get('/gitlab/gitlabhq/merge_requests/1/automerge_check')).to route_to('projects/merge_requests#automerge_check', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
+  it 'to #merge_check' do
+    expect(get('/gitlab/gitlabhq/merge_requests/1/merge_check')).to route_to('projects/merge_requests#merge_check', namespace_id: 'gitlab', project_id: 'gitlabhq', id: '1')
   end
 
   it 'to #branch_from' do
diff --git a/spec/services/merge_requests/create_service_spec.rb b/spec/services/merge_requests/create_service_spec.rb
index d9bfdf6430..cc64d69361 100644
--- a/spec/services/merge_requests/create_service_spec.rb
+++ b/spec/services/merge_requests/create_service_spec.rb
@@ -10,7 +10,7 @@ describe MergeRequests::CreateService do
         {
           title: 'Awesome merge_request',
           description: 'please fix',
-          source_branch: 'stable',
+          source_branch: 'feature',
           target_branch: 'master'
         }
       end
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 0a25fb12f4..7b564d34d7 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -24,11 +24,6 @@ describe MergeRequests::MergeService do
       it { expect(merge_request).to be_valid }
       it { expect(merge_request).to be_merged }
 
-      it 'should execute hooks with merge action' do
-        expect(service).to have_received(:execute_hooks).
-                               with(merge_request, 'merge')
-      end
-
       it 'should send email to user2 about merge of new merge_request' do
         email = ActionMailer::Base.deliveries.last
         expect(email.to.first).to eq(user2.email)
diff --git a/spec/support/mentionable_shared_examples.rb b/spec/support/mentionable_shared_examples.rb
index f0717e6178..e3de0afb44 100644
--- a/spec/support/mentionable_shared_examples.rb
+++ b/spec/support/mentionable_shared_examples.rb
@@ -9,7 +9,7 @@ def common_mentionable_setup
   let(:author)  { subject.author }
 
   let(:mentioned_issue)  { create(:issue, project: project) }
-  let(:mentioned_mr)     { create(:merge_request, :simple, source_project: project) }
+  let!(:mentioned_mr)     { create(:merge_request, :simple, source_project: project) }
   let(:mentioned_commit) { project.commit }
 
   let(:ext_proj)   { create(:project, :public) }

From d25c56cfd8da9b94ba5744a9bd09c05070b25c64 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 11 Aug 2015 14:41:31 +0200
Subject: [PATCH 02/13] Update CHANGELOG

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8801cd6359..7aef3bf40a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+v 8.0.0 (unreleased)
+  - Remove satellites
+  - Better performance for web editor (switched from satellites to rugged)
+  - Faster merge
+  - Ability to fetch merge requests from refs/merge-requests/:id
+  - Improve MR merge widget text and UI consistency.
+  - Improve text in MR "How To Merge" modal.
+
 v 7.14.0 (unreleased)
   - Disable turbolinks when linking to Bitbucket import status (Stan Hu)
   - Fix broken code import and display error messages if something went wrong with creating project (Stan Hu)
@@ -45,10 +53,7 @@ v 7.14.0 (unreleased)
   - Remove redis-store TTL monkey patch
   - Add support for CI skipped status
   - Fetch code from forks to refs/merge-requests/:id/head when merge request created
-  - Remove satellites
   - Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
-  - Improve MR merge widget text and UI consistency.
-  - Improve text in MR "How To Merge" modal.
   - Cache all events
   - Order commits by date when comparing branches
   - Fix bug causing error when the target branch of a symbolic ref was deleted
@@ -199,7 +204,6 @@ v 7.12.0
   - Add SAML support as an omniauth provider
   - Allow to configure a URL to show after sign out
   - Add an option to automatically sign-in with an Omniauth provider
-  - Better performance for web editor (switched from satellites to rugged)
   - GitLab CI service sends .gitlab-ci.yml in each push call
   - When remove project - move repository and schedule it removal
   - Improve group removing logic

From 34690142bf42e0a3d48b1b30075387abefe86318 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 13 Aug 2015 12:57:24 +0200
Subject: [PATCH 03/13] Implement commit transaction with pre-receive and
 post-receive hooks for web editor

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 Gemfile                              |  2 +-
 Gemfile.lock                         |  6 +--
 app/models/repository.rb             |  2 +-
 app/services/commit_service.rb       | 37 +++++++++++++++
 app/services/files/base_service.rb   |  5 --
 app/services/files/create_service.rb |  4 +-
 app/services/files/delete_service.rb |  4 +-
 app/services/files/update_service.rb |  4 +-
 app/services/pre_commit_service.rb   | 71 ++++++++++++++++++++++++++++
 9 files changed, 122 insertions(+), 13 deletions(-)
 create mode 100644 app/services/commit_service.rb
 create mode 100644 app/services/pre_commit_service.rb

diff --git a/Gemfile b/Gemfile
index 2483a7d24a..77bb02a50a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,7 +38,7 @@ gem "browser", '~> 0.8.0'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 7.2.12'
+gem "gitlab_git", '~> 7.2.13'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 # GitLab fork with a lot of changes (improved thread-safety, better memory usage etc)
diff --git a/Gemfile.lock b/Gemfile.lock
index 335f6777c9..2141067183 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -271,7 +271,7 @@ GEM
       mime-types (~> 1.19)
     gitlab_emoji (0.1.0)
       gemojione (~> 2.0)
-    gitlab_git (7.2.12)
+    gitlab_git (7.2.13)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.6)
       gitlab-linguist (~> 3.0)
@@ -783,7 +783,7 @@ DEPENDENCIES
   gitlab-grack (~> 2.0.2)
   gitlab-linguist (~> 3.0.1)
   gitlab_emoji (~> 0.1)
-  gitlab_git (~> 7.2.12)
+  gitlab_git (~> 7.2.13)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (= 1.2.1)
   gollum-lib (~> 4.0.2)
@@ -875,4 +875,4 @@ DEPENDENCIES
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.10.4
+   1.10.6
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 46efbede2a..32b3541907 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -373,7 +373,7 @@ class Repository
     options[:author] = committer
     options[:commit] = {
       message: message,
-      branch: ref
+      branch: ref,
     }
 
     options[:file] = {
diff --git a/app/services/commit_service.rb b/app/services/commit_service.rb
new file mode 100644
index 0000000000..a5603f2669
--- /dev/null
+++ b/app/services/commit_service.rb
@@ -0,0 +1,37 @@
+require 'securerandom'
+
+class CommitService
+  def self.transaction(project, current_user, ref)
+    repository = project.repository
+    path_to_repo = repository.path_to_repo
+
+    # Create temporary ref
+    random_string = SecureRandom.hex
+    tmp_ref = "refs/tmp/#{random_string}/head"
+    target = repository.find_branch(ref).target
+    repository.rugged.references.create(tmp_ref, target)
+
+    # Make commit in tmp ref
+    sha = yield(tmp_ref)
+
+    unless sha
+      raise 'Failed to create commit'
+    end
+
+    # Run GitLab pre-receive hook
+    status = PreCommitService.new(project, current_user).execute(sha, ref)
+
+    if status
+      # Update head
+      repository.rugged.references.update(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
+
+      # Run GitLab post receive hook
+      PostCommitService.new(project, current_user).execute(sha, ref)
+    else
+      # Remove tmp ref and return error to user
+      repository.rugged.references.delete(tmp_ref)
+
+      raise 'Commit was rejected by pre-reveive hook'
+    end
+  end
+end
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb
index d7b40ee890..1f7b92e222 100644
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
@@ -22,7 +22,6 @@ module Files
       end
 
       if sha = commit
-        after_commit(sha, @target_branch)
         success
       else
         error("Something went wrong. Your changes were not committed")
@@ -33,10 +32,6 @@ module Files
 
     private
 
-    def after_commit(sha, branch)
-      PostCommitService.new(project, current_user).execute(sha, branch)
-    end
-
     def current_branch
       @current_branch ||= params[:current_branch]
     end
diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb
index 91d715b2d6..3e00864f00 100644
--- a/app/services/files/create_service.rb
+++ b/app/services/files/create_service.rb
@@ -3,7 +3,9 @@ require_relative "base_service"
 module Files
   class CreateService < Files::BaseService
     def commit
-      repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch)
+      CommitService.transaction(project, current_user, @target_branch)  do |tmp_ref|
+        repository.commit_file(current_user, @file_path, @file_content, @commit_message, tmp_ref)
+      end
     end
 
     def validate
diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb
index 27c881c343..d61ca31cf9 100644
--- a/app/services/files/delete_service.rb
+++ b/app/services/files/delete_service.rb
@@ -3,7 +3,9 @@ require_relative "base_service"
 module Files
   class DeleteService < Files::BaseService
     def commit
-      repository.remove_file(current_user, @file_path, @commit_message, @target_branch)
+      CommitService.transaction(project, current_user, @target_branch)  do |tmp_ref|
+        repository.remove_file(current_user, @file_path, @commit_message, tmp_ref)
+      end
     end
   end
 end
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index a20903c6f0..69212b3699 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -3,7 +3,9 @@ require_relative "base_service"
 module Files
   class UpdateService < Files::BaseService
     def commit
-      repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch)
+      CommitService.transaction(project, current_user, @target_branch)  do |tmp_ref|
+        repository.commit_file(current_user, @file_path, @file_content, @commit_message, tmp_ref)
+      end
     end
   end
 end
diff --git a/app/services/pre_commit_service.rb b/app/services/pre_commit_service.rb
new file mode 100644
index 0000000000..ed8331ddce
--- /dev/null
+++ b/app/services/pre_commit_service.rb
@@ -0,0 +1,71 @@
+class PreCommitService < BaseService
+  include Gitlab::Popen
+
+  attr_reader :changes, :repo_path
+
+  def execute(sha, branch)
+    commit = repository.commit(sha)
+    full_ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
+    old_sha = commit.parent_id || Gitlab::Git::BLANK_SHA
+    @changes = "#{old_sha} #{sha} #{full_ref}"
+    @repo_path = repository.path_to_repo
+
+    pre_receive
+  end
+
+  private
+
+  def pre_receive
+    hook = hook_file('pre-receive', repo_path)
+    return true if hook.nil?
+    call_receive_hook(hook)
+  end
+
+  def call_receive_hook(hook)
+    # function  will return true if succesful
+    exit_status = false
+
+    vars = {
+      'GL_ID' => Gitlab::ShellEnv.gl_id(current_user),
+      'PWD' => repo_path
+    }
+
+    options = {
+      chdir: repo_path
+    }
+
+    # we combine both stdout and stderr as we don't know what stream
+    # will be used by the custom hook
+    Open3.popen2e(vars, hook, options) do |stdin, stdout_stderr, wait_thr|
+      exit_status = true
+      stdin.sync = true
+
+      # in git, pre- and post- receive hooks may just exit without
+      # reading stdin. We catch the exception to avoid a broken pipe
+      # warning
+      begin
+        # inject all the changes as stdin to the hook
+        changes.lines do |line|
+          stdin.puts line
+        end
+      rescue Errno::EPIPE
+      end
+
+      # need to close stdin before reading stdout
+      stdin.close
+
+      # only output stdut_stderr if scripts doesn't return 0
+      unless wait_thr.value == 0
+        exit_status = false
+      end
+    end
+
+    exit_status
+  end
+
+  def hook_file(hook_type, repo_path)
+    hook_path = File.join(repo_path.strip, 'hooks')
+    hook_file = "#{hook_path}/#{hook_type}"
+    hook_file if File.exist?(hook_file)
+  end
+end

From c8614cbbe76a97dc70576451a75907059b4f876c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 13 Aug 2015 14:29:13 +0200
Subject: [PATCH 04/13] Capture pre-receive exception

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/services/commit_service.rb     | 24 ++++++++++++++++++------
 app/services/files/base_service.rb |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/services/commit_service.rb b/app/services/commit_service.rb
index a5603f2669..92d1585840 100644
--- a/app/services/commit_service.rb
+++ b/app/services/commit_service.rb
@@ -1,29 +1,41 @@
 require 'securerandom'
 
 class CommitService
+  class PreReceiveError < StandardError; end
+  class CommitError < StandardError; end
+
   def self.transaction(project, current_user, ref)
     repository = project.repository
     path_to_repo = repository.path_to_repo
+    empty_repo = repository.empty?
 
     # Create temporary ref
     random_string = SecureRandom.hex
     tmp_ref = "refs/tmp/#{random_string}/head"
-    target = repository.find_branch(ref).target
-    repository.rugged.references.create(tmp_ref, target)
+
+    unless empty_repo
+      target = repository.find_branch(ref).target
+      repository.rugged.references.create(tmp_ref, target)
+    end
 
     # Make commit in tmp ref
     sha = yield(tmp_ref)
 
     unless sha
-      raise 'Failed to create commit'
+      raise CommitError.new('Failed to create commit')
     end
 
     # Run GitLab pre-receive hook
     status = PreCommitService.new(project, current_user).execute(sha, ref)
 
     if status
-      # Update head
-      repository.rugged.references.update(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
+      if empty_repo
+        # Create branch
+        repository.rugged.references.create(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
+      else
+        # Update head
+        repository.rugged.references.update(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
+      end
 
       # Run GitLab post receive hook
       PostCommitService.new(project, current_user).execute(sha, ref)
@@ -31,7 +43,7 @@ class CommitService
       # Remove tmp ref and return error to user
       repository.rugged.references.delete(tmp_ref)
 
-      raise 'Commit was rejected by pre-reveive hook'
+      raise PreReceiveError.new('Commit was rejected by pre-reveive hook')
     end
   end
 end
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb
index 1f7b92e222..507e21f581 100644
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
@@ -26,7 +26,7 @@ module Files
       else
         error("Something went wrong. Your changes were not committed")
       end
-    rescue ValidationError => ex
+    rescue CommitService::CommitError, CommitService::PreReceiveError, ValidationError => ex
       error(ex.message)
     end
 

From 9011a3223448a68a77a599c6a38fb338ccfa3f1e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 14 Aug 2015 13:27:51 +0200
Subject: [PATCH 05/13] Disable pre-receive check in test env

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 spec/support/test_env.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 8dc687c358..a2e8f9054a 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -40,6 +40,9 @@ module TestEnv
     # Setup GitLab shell for test instance
     setup_gitlab_shell
 
+    # Skip pre-receive check so we can use web editor
+    disable_pre_receive
+
     # Create repository for FactoryGirl.create(:project)
     setup_factory_repo
 
@@ -57,6 +60,10 @@ module TestEnv
       and_call_original
   end
 
+  def disable_pre_receive
+    allow_any_instance_of(PreCommitService).to receive(:execute).and_return(true)
+  end
+
   # Clean /tmp/tests
   #
   # Keeps gitlab-shell and gitlab-test

From 9649f9387a4ef3c40bc2720053b716c987255363 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 14 Aug 2015 15:08:31 +0200
Subject: [PATCH 06/13] Fix tests for web editor

---
 features/support/env.rb  | 4 ++++
 spec/support/test_env.rb | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/features/support/env.rb b/features/support/env.rb
index 672251af08..62c80b9c94 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -28,5 +28,9 @@ Spinach.hooks.before_run do
   RSpec::Mocks.setup
   TestEnv.init(mailer: false)
 
+  # skip pre-receive hook check so we can use
+  # web editor and merge
+  TestEnv.disable_pre_receive
+
   include FactoryGirl::Syntax::Methods
 end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index a2e8f9054a..3a678db2df 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -40,9 +40,6 @@ module TestEnv
     # Setup GitLab shell for test instance
     setup_gitlab_shell
 
-    # Skip pre-receive check so we can use web editor
-    disable_pre_receive
-
     # Create repository for FactoryGirl.create(:project)
     setup_factory_repo
 

From bacad39ef984b99520f8d2a7921acd5c8bdab1ef Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 14 Aug 2015 15:22:48 +0200
Subject: [PATCH 07/13] Make sure target has not changed during pre-receive
 hook

---
 app/services/commit_service.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/services/commit_service.rb b/app/services/commit_service.rb
index 92d1585840..d158f10353 100644
--- a/app/services/commit_service.rb
+++ b/app/services/commit_service.rb
@@ -34,7 +34,14 @@ class CommitService
         repository.rugged.references.create(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
       else
         # Update head
-        repository.rugged.references.update(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
+        current_target = repository.find_branch(ref).target
+
+        # Make sure target branch was not changed during pre-receive hook
+        if current_target == target
+          repository.rugged.references.update(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
+        else
+          raise CommitError.new('Commit was rejected because branch received new push')
+        end
       end
 
       # Run GitLab post receive hook

From 4e4866f2559262b3c858de15890eb864f18eeca8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 14 Aug 2015 16:00:36 +0200
Subject: [PATCH 08/13] Refactor pre/post receive commit services into one
 class

---
 app/services/commit_service.rb      | 27 ++++++-----
 app/services/post_commit_service.rb | 71 -----------------------------
 app/services/pre_commit_service.rb  | 71 -----------------------------
 lib/gitlab/git/hook.rb              | 59 ++++++++++++++++++++++++
 spec/support/test_env.rb            |  2 +-
 5 files changed, 76 insertions(+), 154 deletions(-)
 delete mode 100644 app/services/post_commit_service.rb
 delete mode 100644 app/services/pre_commit_service.rb
 create mode 100644 lib/gitlab/git/hook.rb

diff --git a/app/services/commit_service.rb b/app/services/commit_service.rb
index d158f10353..5000e73b47 100644
--- a/app/services/commit_service.rb
+++ b/app/services/commit_service.rb
@@ -4,48 +4,53 @@ class CommitService
   class PreReceiveError < StandardError; end
   class CommitError < StandardError; end
 
-  def self.transaction(project, current_user, ref)
+  def self.transaction(project, current_user, branch)
     repository = project.repository
     path_to_repo = repository.path_to_repo
     empty_repo = repository.empty?
+    oldrev = Gitlab::Git::BLANK_SHA
+    ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
+    gl_id = Gitlab::ShellEnv.gl_id(current_user)
 
     # Create temporary ref
     random_string = SecureRandom.hex
     tmp_ref = "refs/tmp/#{random_string}/head"
 
     unless empty_repo
-      target = repository.find_branch(ref).target
-      repository.rugged.references.create(tmp_ref, target)
+      oldrev = repository.find_branch(branch).target
+      repository.rugged.references.create(tmp_ref, oldrev)
     end
 
     # Make commit in tmp ref
-    sha = yield(tmp_ref)
+    newrev = yield(tmp_ref)
 
-    unless sha
+    unless newrev
       raise CommitError.new('Failed to create commit')
     end
 
     # Run GitLab pre-receive hook
-    status = PreCommitService.new(project, current_user).execute(sha, ref)
+    pre_receive_hook = Gitlab::Git::Hook.new('pre-receive', path_to_repo)
+    status = pre_receive_hook.trigger(gl_id, oldrev, newrev, ref)
 
     if status
       if empty_repo
         # Create branch
-        repository.rugged.references.create(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
+        repository.rugged.references.create(ref, newrev)
       else
         # Update head
-        current_target = repository.find_branch(ref).target
+        current_head = repository.find_branch(branch).target
 
         # Make sure target branch was not changed during pre-receive hook
-        if current_target == target
-          repository.rugged.references.update(Gitlab::Git::BRANCH_REF_PREFIX + ref, sha)
+        if current_head == oldrev
+          repository.rugged.references.update(ref, newrev)
         else
           raise CommitError.new('Commit was rejected because branch received new push')
         end
       end
 
       # Run GitLab post receive hook
-      PostCommitService.new(project, current_user).execute(sha, ref)
+      post_receive_hook = Gitlab::Git::Hook.new('post-receive', path_to_repo)
+      status = post_receive_hook.trigger(gl_id, oldrev, newrev, ref)
     else
       # Remove tmp ref and return error to user
       repository.rugged.references.delete(tmp_ref)
diff --git a/app/services/post_commit_service.rb b/app/services/post_commit_service.rb
deleted file mode 100644
index 8592c8d238..0000000000
--- a/app/services/post_commit_service.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-class PostCommitService < BaseService
-  include Gitlab::Popen
-
-  attr_reader :changes, :repo_path
-
-  def execute(sha, branch)
-    commit = repository.commit(sha)
-    full_ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
-    old_sha = commit.parent_id || Gitlab::Git::BLANK_SHA
-    @changes = "#{old_sha} #{sha} #{full_ref}"
-    @repo_path = repository.path_to_repo
-
-    post_receive
-  end
-
-  private
-
-  def post_receive
-    hook = hook_file('post-receive', repo_path)
-    return true if hook.nil?
-    call_receive_hook(hook)
-  end
-
-  def call_receive_hook(hook)
-    # function  will return true if succesful
-    exit_status = false
-
-    vars = {
-      'GL_ID' => Gitlab::ShellEnv.gl_id(current_user),
-      'PWD' => repo_path
-    }
-
-    options = {
-      chdir: repo_path
-    }
-
-    # we combine both stdout and stderr as we don't know what stream
-    # will be used by the custom hook
-    Open3.popen2e(vars, hook, options) do |stdin, stdout_stderr, wait_thr|
-      exit_status = true
-      stdin.sync = true
-
-      # in git, pre- and post- receive hooks may just exit without
-      # reading stdin. We catch the exception to avoid a broken pipe
-      # warning
-      begin
-        # inject all the changes as stdin to the hook
-        changes.lines do |line|
-          stdin.puts line
-        end
-      rescue Errno::EPIPE
-      end
-
-      # need to close stdin before reading stdout
-      stdin.close
-
-      # only output stdut_stderr if scripts doesn't return 0
-      unless wait_thr.value == 0
-        exit_status = false
-      end
-    end
-
-    exit_status
-  end
-
-  def hook_file(hook_type, repo_path)
-    hook_path = File.join(repo_path.strip, 'hooks')
-    hook_file = "#{hook_path}/#{hook_type}"
-    hook_file if File.exist?(hook_file)
-  end
-end
diff --git a/app/services/pre_commit_service.rb b/app/services/pre_commit_service.rb
deleted file mode 100644
index ed8331ddce..0000000000
--- a/app/services/pre_commit_service.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-class PreCommitService < BaseService
-  include Gitlab::Popen
-
-  attr_reader :changes, :repo_path
-
-  def execute(sha, branch)
-    commit = repository.commit(sha)
-    full_ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
-    old_sha = commit.parent_id || Gitlab::Git::BLANK_SHA
-    @changes = "#{old_sha} #{sha} #{full_ref}"
-    @repo_path = repository.path_to_repo
-
-    pre_receive
-  end
-
-  private
-
-  def pre_receive
-    hook = hook_file('pre-receive', repo_path)
-    return true if hook.nil?
-    call_receive_hook(hook)
-  end
-
-  def call_receive_hook(hook)
-    # function  will return true if succesful
-    exit_status = false
-
-    vars = {
-      'GL_ID' => Gitlab::ShellEnv.gl_id(current_user),
-      'PWD' => repo_path
-    }
-
-    options = {
-      chdir: repo_path
-    }
-
-    # we combine both stdout and stderr as we don't know what stream
-    # will be used by the custom hook
-    Open3.popen2e(vars, hook, options) do |stdin, stdout_stderr, wait_thr|
-      exit_status = true
-      stdin.sync = true
-
-      # in git, pre- and post- receive hooks may just exit without
-      # reading stdin. We catch the exception to avoid a broken pipe
-      # warning
-      begin
-        # inject all the changes as stdin to the hook
-        changes.lines do |line|
-          stdin.puts line
-        end
-      rescue Errno::EPIPE
-      end
-
-      # need to close stdin before reading stdout
-      stdin.close
-
-      # only output stdut_stderr if scripts doesn't return 0
-      unless wait_thr.value == 0
-        exit_status = false
-      end
-    end
-
-    exit_status
-  end
-
-  def hook_file(hook_type, repo_path)
-    hook_path = File.join(repo_path.strip, 'hooks')
-    hook_file = "#{hook_path}/#{hook_type}"
-    hook_file if File.exist?(hook_file)
-  end
-end
diff --git a/lib/gitlab/git/hook.rb b/lib/gitlab/git/hook.rb
new file mode 100644
index 0000000000..dd393fe09d
--- /dev/null
+++ b/lib/gitlab/git/hook.rb
@@ -0,0 +1,59 @@
+module Gitlab
+  module Git
+    class Hook
+      attr_reader :name, :repo_path, :path
+
+      def initialize(name, repo_path)
+        @name = name
+        @repo_path = repo_path
+        @path = File.join(repo_path.strip, 'hooks', name)
+      end
+
+      def exists?
+        File.exist?(path)
+      end
+
+      def trigger(gl_id, oldrev, newrev, ref)
+        return true unless exists?
+
+        changes = [oldrev, newrev, ref].join(" ")
+
+        # function  will return true if succesful
+        exit_status = false
+
+        vars = {
+          'GL_ID' => gl_id,
+          'PWD' => repo_path
+        }
+
+        options = {
+          chdir: repo_path
+        }
+
+        Open3.popen2(vars, path, options) do |stdin, _, wait_thr|
+          exit_status = true
+          stdin.sync = true
+
+          # in git, pre- and post- receive hooks may just exit without
+          # reading stdin. We catch the exception to avoid a broken pipe
+          # warning
+          begin
+            # inject all the changes as stdin to the hook
+            changes.lines do |line|
+              stdin.puts line
+            end
+          rescue Errno::EPIPE
+          end
+
+          stdin.close
+
+          unless wait_thr.value == 0
+            exit_status = false
+          end
+        end
+
+        exit_status
+      end
+    end
+  end
+end
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 3a678db2df..3eab74ba98 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -58,7 +58,7 @@ module TestEnv
   end
 
   def disable_pre_receive
-    allow_any_instance_of(PreCommitService).to receive(:execute).and_return(true)
+    allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(true)
   end
 
   # Clean /tmp/tests

From f4149bcddca9c0e7aac078b3e7c198f5624ea107 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 14 Aug 2015 16:23:40 +0200
Subject: [PATCH 09/13] Refactor how repository makes commit with pre/post
 receive hooks

---
 app/models/repository.rb             | 119 ++++++++++++++++++++-------
 app/services/commit_service.rb       |  56 -------------
 app/services/files/base_service.rb   |   2 +-
 app/services/files/create_service.rb |   4 +-
 app/services/files/delete_service.rb |   4 +-
 app/services/files/update_service.rb |   4 +-
 6 files changed, 94 insertions(+), 95 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 32b3541907..99b6cd3cad 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -1,4 +1,9 @@
+require 'securerandom'
+
 class Repository
+  class PreReceiveError < StandardError; end
+  class CommitError < StandardError; end
+
   include Gitlab::ShellAdapter
 
   attr_accessor :raw_repository, :path_with_namespace, :project
@@ -364,43 +369,47 @@ class Repository
     @root_ref ||= raw_repository.root_ref
   end
 
-  def commit_file(user, path, content, message, ref)
-    path[0] = '' if path[0] == '/'
+  def commit_file(user, path, content, message, branch)
+    commit_with_hooks(user, branch) do |ref|
+      path[0] = '' if path[0] == '/'
 
-    committer = user_to_comitter(user)
-    options = {}
-    options[:committer] = committer
-    options[:author] = committer
-    options[:commit] = {
-      message: message,
-      branch: ref,
-    }
+      committer = user_to_comitter(user)
+      options = {}
+      options[:committer] = committer
+      options[:author] = committer
+      options[:commit] = {
+        message: message,
+        branch: ref,
+      }
 
-    options[:file] = {
-      content: content,
-      path: path
-    }
+      options[:file] = {
+        content: content,
+        path: path
+      }
 
-    Gitlab::Git::Blob.commit(raw_repository, options)
+      Gitlab::Git::Blob.commit(raw_repository, options)
+    end
   end
 
-  def remove_file(user, path, message, ref)
-    path[0] = '' if path[0] == '/'
+  def remove_file(user, path, message, branch)
+    commit_with_hooks(user, branch) do |branch|
+      path[0] = '' if path[0] == '/'
 
-    committer = user_to_comitter(user)
-    options = {}
-    options[:committer] = committer
-    options[:author] = committer
-    options[:commit] = {
-      message: message,
-      branch: ref
-    }
+      committer = user_to_comitter(user)
+      options = {}
+      options[:committer] = committer
+      options[:author] = committer
+      options[:commit] = {
+        message: message,
+        branch: ref
+      }
 
-    options[:file] = {
-      path: path
-    }
+      options[:file] = {
+        path: path
+      }
 
-    Gitlab::Git::Blob.remove(raw_repository, options)
+      Gitlab::Git::Blob.remove(raw_repository, options)
+    end
   end
 
   def user_to_comitter(user)
@@ -479,6 +488,58 @@ class Repository
     Gitlab::Popen.popen(args, path_to_repo)
   end
 
+  def commit_with_hooks(current_user, branch)
+    oldrev = Gitlab::Git::BLANK_SHA
+    ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
+    gl_id = Gitlab::ShellEnv.gl_id(current_user)
+
+    # Create temporary ref
+    random_string = SecureRandom.hex
+    tmp_ref = "refs/tmp/#{random_string}/head"
+
+    unless empty?
+      oldrev = find_branch(branch).target
+      rugged.references.create(tmp_ref, oldrev)
+    end
+
+    # Make commit in tmp ref
+    newrev = yield(tmp_ref)
+
+    unless newrev
+      raise CommitError.new('Failed to create commit')
+    end
+
+    # Run GitLab pre-receive hook
+    pre_receive_hook = Gitlab::Git::Hook.new('pre-receive', path_to_repo)
+    status = pre_receive_hook.trigger(gl_id, oldrev, newrev, ref)
+
+    if status
+      if empty?
+        # Create branch
+        rugged.references.create(ref, newrev)
+      else
+        # Update head
+        current_head = find_branch(branch).target
+
+        # Make sure target branch was not changed during pre-receive hook
+        if current_head == oldrev
+          rugged.references.update(ref, newrev)
+        else
+          raise CommitError.new('Commit was rejected because branch received new push')
+        end
+      end
+
+      # Run GitLab post receive hook
+      post_receive_hook = Gitlab::Git::Hook.new('post-receive', path_to_repo)
+      status = post_receive_hook.trigger(gl_id, oldrev, newrev, ref)
+    else
+      # Remove tmp ref and return error to user
+      rugged.references.delete(tmp_ref)
+
+      raise PreReceiveError.new('Commit was rejected by pre-reveive hook')
+    end
+  end
+
   private
 
   def cache
diff --git a/app/services/commit_service.rb b/app/services/commit_service.rb
index 5000e73b47..c77da061a9 100644
--- a/app/services/commit_service.rb
+++ b/app/services/commit_service.rb
@@ -1,61 +1,5 @@
-require 'securerandom'
 
 class CommitService
-  class PreReceiveError < StandardError; end
-  class CommitError < StandardError; end
-
   def self.transaction(project, current_user, branch)
-    repository = project.repository
-    path_to_repo = repository.path_to_repo
-    empty_repo = repository.empty?
-    oldrev = Gitlab::Git::BLANK_SHA
-    ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
-    gl_id = Gitlab::ShellEnv.gl_id(current_user)
-
-    # Create temporary ref
-    random_string = SecureRandom.hex
-    tmp_ref = "refs/tmp/#{random_string}/head"
-
-    unless empty_repo
-      oldrev = repository.find_branch(branch).target
-      repository.rugged.references.create(tmp_ref, oldrev)
-    end
-
-    # Make commit in tmp ref
-    newrev = yield(tmp_ref)
-
-    unless newrev
-      raise CommitError.new('Failed to create commit')
-    end
-
-    # Run GitLab pre-receive hook
-    pre_receive_hook = Gitlab::Git::Hook.new('pre-receive', path_to_repo)
-    status = pre_receive_hook.trigger(gl_id, oldrev, newrev, ref)
-
-    if status
-      if empty_repo
-        # Create branch
-        repository.rugged.references.create(ref, newrev)
-      else
-        # Update head
-        current_head = repository.find_branch(branch).target
-
-        # Make sure target branch was not changed during pre-receive hook
-        if current_head == oldrev
-          repository.rugged.references.update(ref, newrev)
-        else
-          raise CommitError.new('Commit was rejected because branch received new push')
-        end
-      end
-
-      # Run GitLab post receive hook
-      post_receive_hook = Gitlab::Git::Hook.new('post-receive', path_to_repo)
-      status = post_receive_hook.trigger(gl_id, oldrev, newrev, ref)
-    else
-      # Remove tmp ref and return error to user
-      repository.rugged.references.delete(tmp_ref)
-
-      raise PreReceiveError.new('Commit was rejected by pre-reveive hook')
-    end
   end
 end
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb
index 507e21f581..7aecee217d 100644
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
@@ -26,7 +26,7 @@ module Files
       else
         error("Something went wrong. Your changes were not committed")
       end
-    rescue CommitService::CommitError, CommitService::PreReceiveError, ValidationError => ex
+    rescue Repository::CommitError, Repository::PreReceiveError, ValidationError => ex
       error(ex.message)
     end
 
diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb
index 3e00864f00..91d715b2d6 100644
--- a/app/services/files/create_service.rb
+++ b/app/services/files/create_service.rb
@@ -3,9 +3,7 @@ require_relative "base_service"
 module Files
   class CreateService < Files::BaseService
     def commit
-      CommitService.transaction(project, current_user, @target_branch)  do |tmp_ref|
-        repository.commit_file(current_user, @file_path, @file_content, @commit_message, tmp_ref)
-      end
+      repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch)
     end
 
     def validate
diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb
index d61ca31cf9..27c881c343 100644
--- a/app/services/files/delete_service.rb
+++ b/app/services/files/delete_service.rb
@@ -3,9 +3,7 @@ require_relative "base_service"
 module Files
   class DeleteService < Files::BaseService
     def commit
-      CommitService.transaction(project, current_user, @target_branch)  do |tmp_ref|
-        repository.remove_file(current_user, @file_path, @commit_message, tmp_ref)
-      end
+      repository.remove_file(current_user, @file_path, @commit_message, @target_branch)
     end
   end
 end
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index 69212b3699..a20903c6f0 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -3,9 +3,7 @@ require_relative "base_service"
 module Files
   class UpdateService < Files::BaseService
     def commit
-      CommitService.transaction(project, current_user, @target_branch)  do |tmp_ref|
-        repository.commit_file(current_user, @file_path, @file_content, @commit_message, tmp_ref)
-      end
+      repository.commit_file(current_user, @file_path, @file_content, @commit_message, @target_branch)
     end
   end
 end

From 9ea37cda3fa5e0aacf265bcb7739c1d4240f3bdc Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 14 Aug 2015 17:52:49 +0200
Subject: [PATCH 10/13] merge with support of pre-receive and post-receive
 hooks

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/repository.rb                     | 18 ++++++++++--------
 app/services/merge_requests/merge_service.rb | 14 ++------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 99b6cd3cad..f2f75e0e0f 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -392,7 +392,7 @@ class Repository
   end
 
   def remove_file(user, path, message, branch)
-    commit_with_hooks(user, branch) do |branch|
+    commit_with_hooks(user, branch) do |ref|
       path[0] = '' if path[0] == '/'
 
       committer = user_to_comitter(user)
@@ -431,7 +431,7 @@ class Repository
     end
   end
 
-  def merge(source_sha, target_branch, options = {})
+  def merge(user, source_sha, target_branch, options = {})
     our_commit = rugged.branches[target_branch].target
     their_commit = rugged.lookup(source_sha)
 
@@ -441,13 +441,15 @@ class Repository
     merge_index = rugged.merge_commits(our_commit, their_commit)
     return false if merge_index.conflicts?
 
-    actual_options = options.merge(
-      parents: [our_commit, their_commit],
-      tree: merge_index.write_tree(rugged),
-      update_ref: "refs/heads/#{target_branch}"
-    )
+    commit_with_hooks(user, target_branch) do |ref|
+      actual_options = options.merge(
+        parents: [our_commit, their_commit],
+        tree: merge_index.write_tree(rugged),
+        update_ref: ref
+      )
 
-    Rugged::Commit.create(rugged, actual_options)
+      Rugged::Commit.create(rugged, actual_options)
+    end
   end
 
   def search_files(query, ref)
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index 2107529a21..98a67c0bc9 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -17,7 +17,7 @@ module MergeRequests
       end
 
       merge_request.in_locked_state do
-        if merge_changes
+        if commit
           after_merge
           success
         else
@@ -28,12 +28,6 @@ module MergeRequests
 
     private
 
-    def merge_changes
-      if sha = commit
-        after_commit(sha, merge_request.target_branch)
-      end
-    end
-
     def commit
       committer = repository.user_to_comitter(current_user)
 
@@ -43,11 +37,7 @@ module MergeRequests
         committer: committer
       }
 
-      repository.merge(merge_request.source_sha, merge_request.target_branch, options)
-    end
-
-    def after_commit(sha, branch)
-      PostCommitService.new(project, current_user).execute(sha, branch)
+      repository.merge(current_user, merge_request.source_sha, merge_request.target_branch, options)
     end
 
     def after_merge

From a608e45e6b662df438a0884a997c53c5c9125a47 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 14 Aug 2015 17:56:36 +0200
Subject: [PATCH 11/13] Remove unnecessary file

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/services/commit_service.rb | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 app/services/commit_service.rb

diff --git a/app/services/commit_service.rb b/app/services/commit_service.rb
deleted file mode 100644
index c77da061a9..0000000000
--- a/app/services/commit_service.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-class CommitService
-  def self.transaction(project, current_user, branch)
-  end
-end

From 3b93856e131c3539650444356a259dd93f65cd26 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 17 Aug 2015 10:24:25 +0200
Subject: [PATCH 12/13] save repo empty state into variable for proper result

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/repository.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index f2f75e0e0f..a1f2ea1d7e 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -494,12 +494,13 @@ class Repository
     oldrev = Gitlab::Git::BLANK_SHA
     ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
     gl_id = Gitlab::ShellEnv.gl_id(current_user)
+    was_empty = empty?
 
     # Create temporary ref
     random_string = SecureRandom.hex
     tmp_ref = "refs/tmp/#{random_string}/head"
 
-    unless empty?
+    unless was_empty
       oldrev = find_branch(branch).target
       rugged.references.create(tmp_ref, oldrev)
     end
@@ -516,7 +517,7 @@ class Repository
     status = pre_receive_hook.trigger(gl_id, oldrev, newrev, ref)
 
     if status
-      if empty?
+      if was_empty
         # Create branch
         rugged.references.create(ref, newrev)
       else

From e02cff19ed158637bd0199f954f6b40d431e45a4 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 17 Aug 2015 10:47:29 +0200
Subject: [PATCH 13/13] Fix typo in text when raise pre-receive exception

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/repository.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index a1f2ea1d7e..ea298d88f2 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -539,7 +539,7 @@ class Repository
       # Remove tmp ref and return error to user
       rugged.references.delete(tmp_ref)
 
-      raise PreReceiveError.new('Commit was rejected by pre-reveive hook')
+      raise PreReceiveError.new('Commit was rejected by pre-receive hook')
     end
   end