Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-16

# Conflicts:
#	doc/ci/examples/README.md
#	doc/ci/examples/sast_docker.md
#	doc/topics/autodevops/index.md

[ci skip]

app/assets/javascripts/merge_request_tabs.js

@@ -73,6 +73,7 @@ export default class MergeRequestTabs {
   constructor({ action, setUrl, stubLocation } = {}) {
     const mergeRequestTabs = document.querySelector('.js-tabs-affix');
     const navbar = document.querySelector('.navbar-gitlab');
+    const peek = document.getElementById('peek');
     const paddingTop = 16;
 
     this.diffsLoaded = false;
@@ -86,6 +87,10 @@ export default class MergeRequestTabs {
     this.showTab = this.showTab.bind(this);
     this.stickyTop = navbar ? navbar.offsetHeight - paddingTop : 0;
 
+    if (peek) {
+      this.stickyTop += peek.offsetHeight;
+    }
+
     if (mergeRequestTabs) {
       this.stickyTop += mergeRequestTabs.offsetHeight;
     }

doc/ci/examples/README.md

@@ -47,7 +47,11 @@ There's also a collection of repositories with [example projects](https://gitlab
 
 ## Static Application Security Testing (SAST)
 
+<<<<<<< HEAD
 **(Ultimate)** [Scan your code for vulnerabilities](sast.md)
+=======
+**(Ultimate)** [Scan your code for vulnerabilities](https://docs.gitlab.com/ee/ci/examples/sast.html)
+>>>>>>> upstream/master
 
 ## Container Scanning
 

doc/ci/examples/sast_docker.md

+<<<<<<< HEAD
 This document was moved to [another location](./container_scanning.md).
+=======
+This document was moved to [another location](./container_scanning.md).
+>>>>>>> upstream/master

doc/topics/autodevops/index.md

@@ -228,7 +228,11 @@ created, it's uploaded as an artifact which you can later download and
 check out.
 
 In GitLab Ultimate, any security warnings are also
+<<<<<<< HEAD
 [shown in the merge request widget](../../user/project/merge_requests/container_scanning.md).
+=======
+[shown in the merge request widget](https://docs.gitlab.com/ee/user/project/merge_requests/container_scanning.html).
+>>>>>>> upstream/master
 
 ### Auto Review Apps