Merge remote-tracking branch 'ce/8-0-stable' into 8-0-stable-ee

CHANGELOG

 Please view this file on the master branch, on stable branches it's out of date.
+v 8.0.6
+  - Fix loading spinner sometimes not being hidden on Merge Request tab switches
+
 v 8.0.5
   - Correct lookup-by-email for LDAP logins
-  - Fix loading spinner sometimes not being hidden on Merge Request tab switches
 v 8.0.4
   - Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu)

GITLAB_GIT_HTTP_SERVER_VERSION

+0.2.14

VERSION

-8.0.5-ee
\ No newline at end of file
+8.0.5-ee

app/assets/javascripts/merge_request_tabs.js.coffee

@@ -68,8 +68,8 @@ class @MergeRequestTabs
   scrollToElement: (container) ->
     if window.location.hash
-      top = $(container + " " + window.location.hash).offset().top
-      $('body').scrollTo(top)
+      $el = $("#{container} #{window.location.hash}")
+      $('body').scrollTo($el.offset().top) if $el.length
   # Activate a tab based on the current action
   activateTab: (action) ->
@@ -127,7 +127,7 @@ class @MergeRequestTabs
         document.getElementById('commits').innerHTML = data.html
         $('.js-timeago').timeago()
         @commitsLoaded = true
-        @scrollToElement(".commits")
+        @scrollToElement("#commits")
   loadDiff: (source) ->
     return if @diffsLoaded
@@ -137,7 +137,7 @@ class @MergeRequestTabs
       success: (data) =>
         document.getElementById('diffs').innerHTML = data.html
         @diffsLoaded = true
-        @scrollToElement(".diffs")
+        @scrollToElement("#diffs")
   # Show or hide the loading spinner
   #

doc/install/installation.md

@@ -325,6 +325,7 @@ GitLab Shell is an SSH access and repository management software developed speci
     cd /home/git
     sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-git-http-server.git
     cd gitlab-git-http-server
+    sudo -u git -H git checkout 0.2.14
     sudo -u git -H make
 ### Initialize Database and Activate Advanced Features

doc/update/7.14-to-8.0.md

@@ -84,6 +84,7 @@ Now we download `gitlab-git-http-server` and install it in `/home/git/gitlab-git
 cd /home/git
 sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-git-http-server.git
 cd gitlab-git-http-server
+sudo -u git -H git checkout 0.2.14
 sudo -u git -H make
 ```