Merge branch 'master' into check-out-branch-buttoncheck-out-branch-button

23 files changed, 203 insertions, 105 deletions

diff --git a/app/assets/javascripts/dropzone_input.js.coffee b/app/assets/javascripts/dropzone_input.js.coffee
index a4f511301c1..a0dcaa8c27a 100644
--- a/app/assets/javascripts/dropzone_input.js.coffee
+++ b/app/assets/javascripts/dropzone_input.js.coffee
@@ -8,6 +8,7 @@ class @DropzoneInput
     divAlert = "<div class=\"" + alertClass + "\"></div>"
     iconPaperclip = "<i class=\"fa fa-paperclip div-dropzone-icon\"></i>"
     iconSpinner = "<i class=\"fa fa-spinner fa-spin div-dropzone-icon\"></i>"
+    uploadProgress = $("<div class=\"div-dropzone-progress\"></div>")
     btnAlert = "<button type=\"button\"" + alertAttr + ">&times;</button>"
     project_uploads_path = window.project_uploads_path or null
     markdown_preview_path = window.markdown_preview_path or null
@@ -28,6 +29,7 @@ class @DropzoneInput
     form_dropzone.find(".div-dropzone-hover").append iconPaperclip
     form_dropzone.append divSpinner
     form_dropzone.find(".div-dropzone-spinner").append iconSpinner
+    form_dropzone.find(".div-dropzone-spinner").append uploadProgress
     form_dropzone.find(".div-dropzone-spinner").css
       "opacity": 0
       "display": "none"
@@ -112,13 +114,18 @@ class @DropzoneInput
           $(".div-dropzone-alert").append btnAlert + errorMessage
         return
 
+      totaluploadprogress: (totalUploadProgress) ->
+        uploadProgress.text Math.round(totalUploadProgress) + "%"
+        return
+
       sending: ->
         form_dropzone.find(".div-dropzone-spinner").css
           "opacity": 0.7
           "display": "inherit"
         return
 
-      complete: ->
+      queuecomplete: ->
+        uploadProgress.text ""
         $(".dz-preview").remove()
         $(".markdown-area").trigger "input"
         $(".div-dropzone-spinner").css
diff --git a/app/assets/stylesheets/generic/markdown_area.scss b/app/assets/stylesheets/generic/markdown_area.scss
index f94677d1925..a4fc82e90bf 100644
--- a/app/assets/stylesheets/generic/markdown_area.scss
+++ b/app/assets/stylesheets/generic/markdown_area.scss
@@ -40,6 +40,15 @@
       font-size: inherit;
     }
 
+    .div-dropzone-progress {
+      position: absolute;
+      top: 7px;
+      left: -40px;
+      width: 35px;
+      font-size: 13px;
+      text-align: right;
+    }
+
     .dz-preview {
       display: none;
     }
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 2a65ff34108..10fce5b3daa 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -183,6 +183,10 @@
   width: 250px !important;
 }
 
+#modal_merge_info .modal-dialog {
+  width: 600px;
+}
+
 .mr-source-target {
   line-height: 31px;
 }
diff --git a/app/services/post_commit_service.rb b/app/services/post_commit_service.rb
index 7d7e5fbc32e..8592c8d238b 100644
--- a/app/services/post_commit_service.rb
+++ b/app/services/post_commit_service.rb
@@ -1,8 +1,71 @@
 class PostCommitService < BaseService
+  include Gitlab::Popen
+
+  attr_reader :changes, :repo_path
+
   def execute(sha, branch)
     commit = repository.commit(sha)
-    full_ref = 'refs/heads/' + branch
+    full_ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
     old_sha = commit.parent_id || Gitlab::Git::BLANK_SHA
-    GitPushService.new.execute(project, current_user, old_sha, sha, full_ref)
+    @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/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 0377760a9b8..0faab4458e9 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -3,7 +3,7 @@
     .event-item-timestamp
       #{time_ago_with_tooltip(event.created_at)}
 
-    = cache event, "v1" do
+    = cache [event, "v1"] do
       = image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:''
       - if event.created_project?
         = render "events/event/created_project", event: event
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 37a3952635e..9fdeddfcc7a 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -82,12 +82,12 @@
                 You can change your avatar here
                 - if Gitlab.config.gravatar.enabled
                   %br
-                  or remove the current avatar to revert to #{link_to "gravatar.com", "http://gravatar.com"}
+                  or remove the current avatar to revert to #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
               - else
                 You can upload an avatar here
                 - if Gitlab.config.gravatar.enabled
                   %br
-                  or change it at #{link_to "gravatar.com", "http://gravatar.com"}
+                  or change it at #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
             %hr
             %a.choose-btn.btn.btn-sm.js-choose-user-avatar-button
               %i.fa.fa-paperclip
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 22f601ac99e..db1575f899a 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 b5704c502c8..f3cc0e7e8a1 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 17d529766e6..4d4e2f68f61 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -3,26 +3,26 @@
     - [:success, :skipped, :canceled, :failed, :running, :pending].each do |status|
       .ci_widget{class: "ci-#{status}", style: "display:none"}
         - if status == :success
+          - status = "passed"
           = icon("check-circle")
         - else
           = icon("circle")
         %span CI build #{status}
         for #{@merge_request.last_commit_short_sha}.
         %span.ci-coverage
-        = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
+        = 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-circle")
-      %span Can not find commit in the CI server
-      for #{@merge_request.last_commit_short_sha}.
+      Could not find CI status for #{@merge_request.last_commit_short_sha}.
 
     .ci_widget.ci-error{style: "display:none"}
       = icon("times-circle")
-      %span Cannot connect to the CI server. Please check your settings and try again.
+      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 13ec278847b..78d0783cba0 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 a3b13140810..d22dfa085b8 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 f420cdcab49..0aad9bb3e88 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -22,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/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index 1be98cbe8de..e1525f6aeb7 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -8,10 +8,10 @@
       .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,
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 eaf113ee568..ab30fa6b243 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 e775447cb75..b6b8974297e 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 440a7aa1c61..e6c089fefb2 100644
--- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
@@ -1,11 +1,10 @@
 %h4
-  This merge request contains merge conflicts that must be resolved.
+  = icon("exclamation-triangle")
+  This merge request contains merge conflicts
 
-- if @merge_request.can_be_merged_by?(current_user)
-  %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
-  %p
-    Only those with write access to this repository can merge merge requests.
+%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 1c565bae80a..c9f07629493 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/_not_allowed.html.haml b/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
index 82f6ffd8fcb..a8145558ca8 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 4d526576bc2..35626b624b7 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 5787f6efea4..acfc31725eb 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 4ce3ab31278..0cf16542cc1 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 ac8c1936c9e..3489bf3f191 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/post_receive.rb b/app/workers/post_receive.rb
index 33d8cc8861b..994b8e8ed38 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -45,7 +45,7 @@ class PostReceive
 
   def utf8_encode_changes(changes)
     changes = changes.dup
-    
+
     changes.force_encoding("UTF-8")
     return changes if changes.valid_encoding?