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

# Conflicts:
#	lib/gitlab/git/gitlab_projects.rb

[ci skip]

GITLAB_PAGES_VERSION

-0.7.0
+0.7.1

app/assets/javascripts/monitoring/components/graph.vue

@@ -209,6 +209,7 @@
 
         const xAxis = d3.axisBottom()
           .scale(axisXScale)
+          .ticks(this.graphWidth / 120)
           .tickFormat(timeScaleFormat);
 
         const yAxis = d3.axisLeft()

app/assets/stylesheets/framework/mixins.scss

@@ -17,8 +17,6 @@
  */
 @mixin markdown-table {
   width: auto;
-  display: block;
-  overflow-x: auto;
 }
 
 /*

app/assets/stylesheets/pages/wiki.scss

@@ -180,6 +180,11 @@ ul.wiki-pages-list.content-list {
   }
 }
 
+.wiki-holder {
+  overflow-x: auto;
+  overflow-y: hidden;
+}
+
 .wiki {
   table {
     @include markdown-table;

changelogs/unreleased/44024-fix-table-extra-column.yml

+---
+title: Fix markdown table showing extra column
+merge_request: 17669
+author:
+type: fixed

doc/downgrade_ee_to_ce/README.md

@@ -70,7 +70,7 @@ To downgrade an Omnibus installation, it is sufficient to install the Community
 Edition package on top of the currently installed one. You can do this manually,
 by directly [downloading the package](https://packages.gitlab.com/gitlab/gitlab-ce)
 you need, or by adding our CE package repository and following the
-[CE installation instructions](https://about.gitlab.com/downloads/).
+[CE installation instructions](https://about.gitlab.com/downloads/?version=ce).
 
 **Source Installation**
 

lib/gitlab/git/gitlab_projects.rb

@@ -67,7 +67,11 @@ module Gitlab
         tags_option = tags ? '--tags' : '--no-tags'
 
         logger.info "Fetching remote #{name} for repository #{repository_absolute_path}."
+<<<<<<< HEAD
         cmd = %W(#{git_fetch_binary} fetch #{name} --quiet)
+=======
+        cmd = %W(#{Gitlab.config.git.bin_path} fetch #{name} --quiet)
+>>>>>>> upstream/master
         cmd << '--prune' if prune
         cmd << '--force' if force
         cmd << tags_option