Commit 2fd81665 authored by Stan Hu's avatar Stan Hu

Merge branch 'ce-to-ee-2018-03-13' into 'master'

CE upstream - 2018-03-13 21:25 UTC

Closes gitlab-ce#44024

See merge request gitlab-org/gitlab-ee!4958
parents f69f6a23 0401e34c
......@@ -209,6 +209,7 @@
const xAxis = d3.axisBottom()
.scale(axisXScale)
.ticks(this.graphWidth / 120)
.tickFormat(timeScaleFormat);
const yAxis = d3.axisLeft()
......
......@@ -17,8 +17,6 @@
*/
@mixin markdown-table {
width: auto;
display: block;
overflow-x: auto;
}
/*
......
......@@ -180,6 +180,11 @@ ul.wiki-pages-list.content-list {
}
}
.wiki-holder {
overflow-x: auto;
overflow-y: hidden;
}
.wiki {
table {
@include markdown-table;
......
---
title: Fix markdown table showing extra column
merge_request: 17669
author:
type: fixed
......@@ -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**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment