Merge branch 'sh-make-kib-human' into 'master'
Humanize the units of "Showing last X KiB of log" in job trace Closes #38613 See merge request gitlab-org/gitlab-ce!16147
This commit is contained in:
commit
f1d5e509b5
|
@ -1,7 +1,7 @@
|
|||
import _ from 'underscore';
|
||||
import { visitUrl } from './lib/utils/url_utility';
|
||||
import bp from './breakpoints';
|
||||
import { bytesToKiB } from './lib/utils/number_utils';
|
||||
import { numberToHumanSize } from './lib/utils/number_utils';
|
||||
import { setCiStatusFavicon } from './lib/utils/common_utils';
|
||||
import { timeFor } from './lib/utils/datetime_utility';
|
||||
|
||||
|
@ -193,7 +193,7 @@ export default class Job {
|
|||
// we need to show a message warning the user about that.
|
||||
if (this.logBytes < log.total) {
|
||||
// size is in bytes, we need to calculate KiB
|
||||
const size = bytesToKiB(this.logBytes);
|
||||
const size = numberToHumanSize(this.logBytes);
|
||||
$('.js-truncated-info-size').html(`${size}`);
|
||||
this.$truncatedInfo.removeClass('hidden');
|
||||
} else {
|
||||
|
|
|
@ -60,7 +60,7 @@
|
|||
.js-truncated-info.truncated-info.hidden-xs.pull-left.hidden<
|
||||
Showing last
|
||||
%span.js-truncated-info-size.truncated-info-size><
|
||||
KiB of log -
|
||||
of log -
|
||||
%a.js-raw-link.raw-link{ href: raw_project_job_path(@project, @build) }>< Complete Raw
|
||||
|
||||
.controllers.pull-right
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Humanize the units of "Showing last X KiB of log" in job trace
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
|
@ -1,4 +1,4 @@
|
|||
import { bytesToKiB } from '~/lib/utils/number_utils';
|
||||
import { numberToHumanSize } from '~/lib/utils/number_utils';
|
||||
import * as urlUtils from '~/lib/utils/url_utility';
|
||||
import '~/lib/utils/datetime_utility';
|
||||
import Job from '~/job';
|
||||
|
@ -169,7 +169,7 @@ describe('Job', () => {
|
|||
|
||||
expect(
|
||||
document.querySelector('.js-truncated-info-size').textContent.trim(),
|
||||
).toEqual(`${bytesToKiB(size)}`);
|
||||
).toEqual(`${numberToHumanSize(size)}`);
|
||||
});
|
||||
|
||||
it('shows incremented size', () => {
|
||||
|
@ -195,7 +195,7 @@ describe('Job', () => {
|
|||
|
||||
expect(
|
||||
document.querySelector('.js-truncated-info-size').textContent.trim(),
|
||||
).toEqual(`${bytesToKiB(50)}`);
|
||||
).toEqual(`${numberToHumanSize(50)}`);
|
||||
|
||||
jasmine.clock().tick(4001);
|
||||
|
||||
|
@ -209,7 +209,7 @@ describe('Job', () => {
|
|||
|
||||
expect(
|
||||
document.querySelector('.js-truncated-info-size').textContent.trim(),
|
||||
).toEqual(`${bytesToKiB(60)}`);
|
||||
).toEqual(`${numberToHumanSize(60)}`);
|
||||
});
|
||||
|
||||
it('renders the raw link', () => {
|
||||
|
|
Loading…
Reference in New Issue