Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
Robert Speicher
parent
e6adc5b3f1
commit
5982b74e32
|
|
@ -42,7 +42,7 @@ export default {
|
|||
|
||||
<template>
|
||||
<div v-if="showMetadata">
|
||||
<h3 class="gl-font-lg gl-mt-5" data-testid="title">{{ __('Additional Metadata') }}</h3>
|
||||
<h3 class="gl-font-lg" data-testid="title">{{ __('Additional Metadata') }}</h3>
|
||||
|
||||
<div class="gl-bg-gray-50 gl-inset-border-1-gray-100 gl-rounded-base" data-testid="main">
|
||||
<template v-if="packageEntity.nuget_metadatum">
|
||||
|
|
|
|||
|
|
@ -31,18 +31,19 @@ export default {
|
|||
|
||||
<template>
|
||||
<div>
|
||||
<p class="gl-mt-3 gl-font-weight-bold" data-testid="registry-include-title">
|
||||
<h3 class="gl-font-lg">{{ __('Installation') }}</h3>
|
||||
<h4 class="gl-font-base" data-testid="registry-include-title">
|
||||
{{ $options.i18n.registryInclude }}
|
||||
</p>
|
||||
</h4>
|
||||
|
||||
<code-instruction
|
||||
:instruction="composerRegistryInclude"
|
||||
:copy-text="$options.i18n.copyRegistryInclude"
|
||||
:tracking-action="$options.trackingActions.COPY_COMPOSER_REGISTRY_INCLUDE_COMMAND"
|
||||
/>
|
||||
|
||||
<p class="gl-mt-3 gl-font-weight-bold" data-testid="package-include-title">
|
||||
<h4 class="gl-font-base" data-testid="package-include-title">
|
||||
{{ $options.i18n.packageInclude }}
|
||||
</p>
|
||||
</h4>
|
||||
<code-instruction
|
||||
:instruction="composerPackageInclude"
|
||||
:copy-text="$options.i18n.copyPackageInclude"
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
import { GlLink, GlSprintf } from '@gitlab/ui';
|
||||
import { s__ } from '~/locale';
|
||||
import CodeInstruction from './code_instruction.vue';
|
||||
import { TrackingActions, TrackingLabels } from '../constants';
|
||||
import { TrackingActions } from '../constants';
|
||||
import { mapGetters, mapState } from 'vuex';
|
||||
import InstallationTabs from './installation_tabs.vue';
|
||||
|
||||
export default {
|
||||
name: 'ConanInstallation',
|
||||
|
|
@ -12,7 +11,6 @@ export default {
|
|||
CodeInstruction,
|
||||
GlLink,
|
||||
GlSprintf,
|
||||
InstallationTabs,
|
||||
},
|
||||
computed: {
|
||||
...mapState(['conanHelpPath']),
|
||||
|
|
@ -24,37 +22,35 @@ export default {
|
|||
),
|
||||
},
|
||||
trackingActions: { ...TrackingActions },
|
||||
trackingLabel: TrackingLabels.CONAN_INSTALLATION,
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<installation-tabs :tracking-label="$options.trackingLabel">
|
||||
<template #installation>
|
||||
<p class="gl-mt-3 font-weight-bold">{{ s__('PackageRegistry|Conan Command') }}</p>
|
||||
<code-instruction
|
||||
:instruction="conanInstallationCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy Conan Command')"
|
||||
class="js-conan-command"
|
||||
:tracking-action="$options.trackingActions.COPY_CONAN_COMMAND"
|
||||
/>
|
||||
</template>
|
||||
<div>
|
||||
<h3 class="gl-font-lg">{{ __('Installation') }}</h3>
|
||||
<h4 class="gl-font-base">
|
||||
{{ s__('PackageRegistry|Conan Command') }}
|
||||
</h4>
|
||||
|
||||
<template #setup>
|
||||
<p class="gl-mt-3 font-weight-bold">
|
||||
{{ s__('PackageRegistry|Add Conan Remote') }}
|
||||
</p>
|
||||
<code-instruction
|
||||
:instruction="conanSetupCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy Conan Setup Command')"
|
||||
class="js-conan-setup"
|
||||
:tracking-action="$options.trackingActions.COPY_CONAN_SETUP_COMMAND"
|
||||
/>
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="conanHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</template>
|
||||
</installation-tabs>
|
||||
<code-instruction
|
||||
:instruction="conanInstallationCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy Conan Command')"
|
||||
:tracking-action="$options.trackingActions.COPY_CONAN_COMMAND"
|
||||
/>
|
||||
|
||||
<h3 class="gl-font-lg">{{ __('Registry setup') }}</h3>
|
||||
<h4 class="gl-font-base">
|
||||
{{ s__('PackageRegistry|Add Conan Remote') }}
|
||||
</h4>
|
||||
<code-instruction
|
||||
:instruction="conanSetupCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy Conan Setup Command')"
|
||||
:tracking-action="$options.trackingActions.COPY_CONAN_SETUP_COMMAND"
|
||||
/>
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="conanHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ export default {
|
|||
|
||||
<template>
|
||||
<div v-if="installationComponent">
|
||||
<h3 class="gl-font-lg gl-mt-5" data-testid="title">{{ __('Installation Commands') }}</h3>
|
||||
<component
|
||||
:is="installationComponent"
|
||||
:name="packageEntity.name"
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
<script>
|
||||
import Tracking from '~/tracking';
|
||||
import { trackInstallationTabChange } from '../utils';
|
||||
import { GlTab, GlTabs } from '@gitlab/ui';
|
||||
|
||||
export default {
|
||||
name: 'TabWrapper',
|
||||
components: {
|
||||
GlTab,
|
||||
GlTabs,
|
||||
},
|
||||
mixins: [Tracking.mixin(), trackInstallationTabChange],
|
||||
props: {
|
||||
trackingLabel: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="gl-mb-3">
|
||||
<gl-tabs @input="trackInstallationTabChange">
|
||||
<gl-tab :title="s__('PackageRegistry|Installation')" title-item-class="js-installation-tab">
|
||||
<div class="gl-ml-3 gl-mr-3">
|
||||
<slot name="installation"></slot>
|
||||
</div>
|
||||
</gl-tab>
|
||||
<gl-tab :title="s__('PackageRegistry|Registry Setup')" title-item-class="js-setup-tab">
|
||||
<div class="gl-ml-3 gl-mr-3">
|
||||
<slot name="setup"></slot>
|
||||
</div>
|
||||
</gl-tab>
|
||||
</gl-tabs>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -2,9 +2,8 @@
|
|||
import { GlLink, GlSprintf } from '@gitlab/ui';
|
||||
import { s__ } from '~/locale';
|
||||
import CodeInstruction from './code_instruction.vue';
|
||||
import { TrackingActions, TrackingLabels } from '../constants';
|
||||
import { TrackingActions } from '../constants';
|
||||
import { mapGetters, mapState } from 'vuex';
|
||||
import InstallationTabs from './installation_tabs.vue';
|
||||
|
||||
export default {
|
||||
name: 'MavenInstallation',
|
||||
|
|
@ -12,7 +11,6 @@ export default {
|
|||
CodeInstruction,
|
||||
GlLink,
|
||||
GlSprintf,
|
||||
InstallationTabs,
|
||||
},
|
||||
computed: {
|
||||
...mapState(['mavenHelpPath']),
|
||||
|
|
@ -30,60 +28,57 @@ export default {
|
|||
),
|
||||
},
|
||||
trackingActions: { ...TrackingActions },
|
||||
trackingLabel: TrackingLabels.MAVEN_INSTALLATION,
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<installation-tabs :tracking-label="$options.trackingLabel">
|
||||
<template #installation>
|
||||
<p class="gl-mt-3 font-weight-bold">{{ s__('PackageRegistry|Maven XML') }}</p>
|
||||
<p>
|
||||
<gl-sprintf :message="$options.i18n.xmlText">
|
||||
<template #code="{ content }">
|
||||
<code>{{ content }}</code>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</p>
|
||||
<code-instruction
|
||||
:instruction="mavenInstallationXml"
|
||||
:copy-text="s__('PackageRegistry|Copy Maven XML')"
|
||||
class="js-maven-xml"
|
||||
multiline
|
||||
:tracking-action="$options.trackingActions.COPY_MAVEN_XML"
|
||||
/>
|
||||
<div>
|
||||
<h3 class="gl-font-lg">{{ __('Installation') }}</h3>
|
||||
|
||||
<p class="gl-mt-3 font-weight-bold">
|
||||
{{ s__('PackageRegistry|Maven Command') }}
|
||||
</p>
|
||||
<code-instruction
|
||||
:instruction="mavenInstallationCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy Maven command')"
|
||||
class="js-maven-command"
|
||||
:tracking-action="$options.trackingActions.COPY_MAVEN_COMMAND"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<template #setup>
|
||||
<p>
|
||||
<gl-sprintf :message="$options.i18n.setupText">
|
||||
<template #code="{ content }">
|
||||
<code>{{ content }}</code>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</p>
|
||||
<code-instruction
|
||||
:instruction="mavenSetupXml"
|
||||
:copy-text="s__('PackageRegistry|Copy Maven registry XML')"
|
||||
class="js-maven-setup-xml"
|
||||
multiline
|
||||
:tracking-action="$options.trackingActions.COPY_MAVEN_SETUP"
|
||||
/>
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="mavenHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
<h4 class="gl-font-base">
|
||||
{{ s__('PackageRegistry|Maven XML') }}
|
||||
</h4>
|
||||
<p>
|
||||
<gl-sprintf :message="$options.i18n.xmlText">
|
||||
<template #code="{ content }">
|
||||
<code>{{ content }}</code>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</template>
|
||||
</installation-tabs>
|
||||
</p>
|
||||
<code-instruction
|
||||
:instruction="mavenInstallationXml"
|
||||
:copy-text="s__('PackageRegistry|Copy Maven XML')"
|
||||
multiline
|
||||
:tracking-action="$options.trackingActions.COPY_MAVEN_XML"
|
||||
/>
|
||||
|
||||
<h4 class="gl-font-base">
|
||||
{{ s__('PackageRegistry|Maven Command') }}
|
||||
</h4>
|
||||
<code-instruction
|
||||
:instruction="mavenInstallationCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy Maven command')"
|
||||
:tracking-action="$options.trackingActions.COPY_MAVEN_COMMAND"
|
||||
/>
|
||||
|
||||
<h3 class="gl-font-lg">{{ __('Registry setup') }}</h3>
|
||||
<p>
|
||||
<gl-sprintf :message="$options.i18n.setupText">
|
||||
<template #code="{ content }">
|
||||
<code>{{ content }}</code>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</p>
|
||||
<code-instruction
|
||||
:instruction="mavenSetupXml"
|
||||
:copy-text="s__('PackageRegistry|Copy Maven registry XML')"
|
||||
multiline
|
||||
:tracking-action="$options.trackingActions.COPY_MAVEN_SETUP"
|
||||
/>
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="mavenHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
import { GlLink, GlSprintf } from '@gitlab/ui';
|
||||
import { s__ } from '~/locale';
|
||||
import CodeInstruction from './code_instruction.vue';
|
||||
import { NpmManager, TrackingActions, TrackingLabels } from '../constants';
|
||||
import { NpmManager, TrackingActions } from '../constants';
|
||||
import { mapGetters, mapState } from 'vuex';
|
||||
import InstallationTabs from './installation_tabs.vue';
|
||||
|
||||
export default {
|
||||
name: 'NpmInstallation',
|
||||
|
|
@ -12,7 +11,6 @@ export default {
|
|||
CodeInstruction,
|
||||
GlLink,
|
||||
GlSprintf,
|
||||
InstallationTabs,
|
||||
},
|
||||
computed: {
|
||||
...mapState(['npmHelpPath']),
|
||||
|
|
@ -36,52 +34,47 @@ export default {
|
|||
),
|
||||
},
|
||||
trackingActions: { ...TrackingActions },
|
||||
trackingLabel: TrackingLabels.NPM_INSTALLATION,
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<installation-tabs :tracking-label="$options.trackingLabel">
|
||||
<template #installation>
|
||||
<p class="gl-mt-3 font-weight-bold">{{ s__('PackageRegistry|npm') }}</p>
|
||||
<code-instruction
|
||||
:instruction="npmCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy npm command')"
|
||||
class="js-npm-install"
|
||||
:tracking-action="$options.trackingActions.COPY_NPM_INSTALL_COMMAND"
|
||||
/>
|
||||
<div>
|
||||
<h3 class="gl-font-lg">{{ __('Installation') }}</h3>
|
||||
<h4 class="gl-font-base">{{ s__('PackageRegistry|npm command') }}</h4>
|
||||
|
||||
<p class="gl-mt-3 font-weight-bold">{{ s__('PackageRegistry|yarn') }}</p>
|
||||
<code-instruction
|
||||
:instruction="yarnCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy yarn command')"
|
||||
class="js-yarn-install"
|
||||
:tracking-action="$options.trackingActions.COPY_YARN_INSTALL_COMMAND"
|
||||
/>
|
||||
</template>
|
||||
<code-instruction
|
||||
:instruction="npmCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy npm command')"
|
||||
:tracking-action="$options.trackingActions.COPY_NPM_INSTALL_COMMAND"
|
||||
/>
|
||||
|
||||
<template #setup>
|
||||
<p class="gl-mt-3 font-weight-bold">{{ s__('PackageRegistry|npm') }}</p>
|
||||
<code-instruction
|
||||
:instruction="npmSetup"
|
||||
:copy-text="s__('PackageRegistry|Copy npm setup command')"
|
||||
class="js-npm-setup"
|
||||
:tracking-action="$options.trackingActions.COPY_NPM_SETUP_COMMAND"
|
||||
/>
|
||||
<h4 class="gl-font-base">{{ s__('PackageRegistry|yarn command') }}</h4>
|
||||
<code-instruction
|
||||
:instruction="yarnCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy yarn command')"
|
||||
:tracking-action="$options.trackingActions.COPY_YARN_INSTALL_COMMAND"
|
||||
/>
|
||||
|
||||
<p class="gl-mt-3 font-weight-bold">{{ s__('PackageRegistry|yarn') }}</p>
|
||||
<code-instruction
|
||||
:instruction="yarnSetupCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy yarn setup command')"
|
||||
class="js-yarn-setup"
|
||||
:tracking-action="$options.trackingActions.COPY_YARN_SETUP_COMMAND"
|
||||
/>
|
||||
<h3 class="gl-font-lg">{{ __('Registry setup') }}</h3>
|
||||
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="npmHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</template>
|
||||
</installation-tabs>
|
||||
<h4 class="gl-font-base">{{ s__('PackageRegistry|npm command') }}</h4>
|
||||
<code-instruction
|
||||
:instruction="npmSetup"
|
||||
:copy-text="s__('PackageRegistry|Copy npm setup command')"
|
||||
:tracking-action="$options.trackingActions.COPY_NPM_SETUP_COMMAND"
|
||||
/>
|
||||
|
||||
<h4 class="gl-font-base">{{ s__('PackageRegistry|yarn command') }}</h4>
|
||||
<code-instruction
|
||||
:instruction="yarnSetupCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy yarn setup command')"
|
||||
:tracking-action="$options.trackingActions.COPY_YARN_SETUP_COMMAND"
|
||||
/>
|
||||
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="npmHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
import { GlLink, GlSprintf } from '@gitlab/ui';
|
||||
import { s__ } from '~/locale';
|
||||
import CodeInstruction from './code_instruction.vue';
|
||||
import { TrackingActions, TrackingLabels } from '../constants';
|
||||
import { TrackingActions } from '../constants';
|
||||
import { mapGetters, mapState } from 'vuex';
|
||||
import InstallationTabs from './installation_tabs.vue';
|
||||
|
||||
export default {
|
||||
name: 'NugetInstallation',
|
||||
|
|
@ -12,7 +11,6 @@ export default {
|
|||
CodeInstruction,
|
||||
GlLink,
|
||||
GlSprintf,
|
||||
InstallationTabs,
|
||||
},
|
||||
computed: {
|
||||
...mapState(['nugetHelpPath']),
|
||||
|
|
@ -24,37 +22,34 @@ export default {
|
|||
),
|
||||
},
|
||||
trackingActions: { ...TrackingActions },
|
||||
trackingLabel: TrackingLabels.NUGET_INSTALLATION,
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<installation-tabs :tracking-label="$options.trackingLabel">
|
||||
<template #installation>
|
||||
<p class="gl-mt-3 font-weight-bold">{{ s__('PackageRegistry|NuGet Command') }}</p>
|
||||
<code-instruction
|
||||
:instruction="nugetInstallationCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy NuGet Command')"
|
||||
class="js-nuget-command"
|
||||
:tracking-action="$options.trackingActions.COPY_NUGET_INSTALL_COMMAND"
|
||||
/>
|
||||
</template>
|
||||
<div>
|
||||
<h3 class="gl-font-lg">{{ __('Installation') }}</h3>
|
||||
<h4 class="gl-font-base">
|
||||
{{ s__('PackageRegistry|NuGet Command') }}
|
||||
</h4>
|
||||
<code-instruction
|
||||
:instruction="nugetInstallationCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy NuGet Command')"
|
||||
:tracking-action="$options.trackingActions.COPY_NUGET_INSTALL_COMMAND"
|
||||
/>
|
||||
<h3 class="gl-font-lg">{{ __('Registry setup') }}</h3>
|
||||
<h4 class="gl-font-base">
|
||||
{{ s__('PackageRegistry|Add NuGet Source') }}
|
||||
</h4>
|
||||
|
||||
<template #setup>
|
||||
<p class="gl-mt-3 font-weight-bold">
|
||||
{{ s__('PackageRegistry|Add NuGet Source') }}
|
||||
</p>
|
||||
<code-instruction
|
||||
:instruction="nugetSetupCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy NuGet Setup Command')"
|
||||
class="js-nuget-setup"
|
||||
:tracking-action="$options.trackingActions.COPY_NUGET_SETUP_COMMAND"
|
||||
/>
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="nugetHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</template>
|
||||
</installation-tabs>
|
||||
<code-instruction
|
||||
:instruction="nugetSetupCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy NuGet Setup Command')"
|
||||
:tracking-action="$options.trackingActions.COPY_NUGET_SETUP_COMMAND"
|
||||
/>
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="nugetHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ export default {
|
|||
|
||||
<template>
|
||||
<div class="issuable-discussion">
|
||||
<h3 class="gl-font-lg gl-my-3" data-testid="title">{{ __('History') }}</h3>
|
||||
<h3 class="gl-font-lg" data-testid="title">{{ __('History') }}</h3>
|
||||
<ul class="timeline main-notes-list notes gl-mb-4" data-testid="timeline">
|
||||
<history-element icon="clock" data-testid="created-on">
|
||||
<gl-sprintf :message="$options.i18n.createdOn">
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
import { GlLink, GlSprintf } from '@gitlab/ui';
|
||||
import { s__ } from '~/locale';
|
||||
import CodeInstruction from './code_instruction.vue';
|
||||
import { TrackingActions, TrackingLabels } from '../constants';
|
||||
import { TrackingActions } from '../constants';
|
||||
import { mapGetters, mapState } from 'vuex';
|
||||
import InstallationTabs from './installation_tabs.vue';
|
||||
|
||||
export default {
|
||||
name: 'PyPiInstallation',
|
||||
|
|
@ -12,7 +11,6 @@ export default {
|
|||
CodeInstruction,
|
||||
GlLink,
|
||||
GlSprintf,
|
||||
InstallationTabs,
|
||||
},
|
||||
computed: {
|
||||
...mapState(['pypiHelpPath']),
|
||||
|
|
@ -27,44 +25,44 @@ export default {
|
|||
),
|
||||
},
|
||||
trackingActions: { ...TrackingActions },
|
||||
trackingLabel: TrackingLabels.PYPI_INSTALLATION,
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<installation-tabs :tracking-label="$options.trackingLabel">
|
||||
<template #installation>
|
||||
<p class="gl-mt-3 font-weight-bold">
|
||||
{{ s__('PackageRegistry|Pip Command') }}
|
||||
</p>
|
||||
<code-instruction
|
||||
:instruction="pypiPipCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy Pip command')"
|
||||
data-testid="pip-command"
|
||||
:tracking-action="$options.trackingActions.COPY_PIP_INSTALL_COMMAND"
|
||||
/>
|
||||
</template>
|
||||
<div>
|
||||
<h3 class="gl-font-lg">{{ __('Installation') }}</h3>
|
||||
|
||||
<template #setup>
|
||||
<p>
|
||||
<gl-sprintf :message="$options.i18n.setupText">
|
||||
<template #code="{ content }">
|
||||
<code>{{ content }}</code>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</p>
|
||||
<code-instruction
|
||||
:instruction="pypiSetupCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy .pypirc content')"
|
||||
data-testid="pypi-setup-content"
|
||||
multiline
|
||||
:tracking-action="$options.trackingActions.COPY_PYPI_SETUP_COMMAND"
|
||||
/>
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="pypiHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
<h4 class="gl-font-base">
|
||||
{{ s__('PackageRegistry|Pip Command') }}
|
||||
</h4>
|
||||
|
||||
<code-instruction
|
||||
:instruction="pypiPipCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy Pip command')"
|
||||
data-testid="pip-command"
|
||||
:tracking-action="$options.trackingActions.COPY_PIP_INSTALL_COMMAND"
|
||||
/>
|
||||
|
||||
<h3 class="gl-font-lg">{{ __('Registry setup') }}</h3>
|
||||
<p>
|
||||
<gl-sprintf :message="$options.i18n.setupText">
|
||||
<template #code="{ content }">
|
||||
<code>{{ content }}</code>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</template>
|
||||
</installation-tabs>
|
||||
</p>
|
||||
|
||||
<code-instruction
|
||||
:instruction="pypiSetupCommand"
|
||||
:copy-text="s__('PackageRegistry|Copy .pypirc content')"
|
||||
data-testid="pypi-setup-content"
|
||||
multiline
|
||||
:tracking-action="$options.trackingActions.COPY_PYPI_SETUP_COMMAND"
|
||||
/>
|
||||
<gl-sprintf :message="$options.i18n.helpText">
|
||||
<template #link="{ content }">
|
||||
<gl-link :href="pypiHelpPath" target="_blank">{{ content }}</gl-link>
|
||||
</template>
|
||||
</gl-sprintf>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
.col-sm-12
|
||||
%hr
|
||||
|
||||
.col-lg-4.profile-settings-sidebar
|
||||
.col-lg-4.profile-settings-sidebar#behavior
|
||||
%h4.gl-mt-0
|
||||
= s_('Preferences|Behavior')
|
||||
%p
|
||||
|
|
@ -51,8 +51,10 @@
|
|||
= s_('Preferences|Choose between fixed (max. 1280px) and fluid (%{percentage}) application layout.').html_safe % { percentage: '100%' }
|
||||
.form-group
|
||||
= f.label :dashboard, class: 'label-bold' do
|
||||
= s_('Preferences|Default dashboard')
|
||||
= s_('Preferences|Homepage content')
|
||||
= f.select :dashboard, dashboard_choices, {}, class: 'select2'
|
||||
.form-text.text-muted
|
||||
= s_('Preferences|Choose what content you want to see on your homepage.')
|
||||
|
||||
= render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Update preferences for homepage/dashboard wording
|
||||
merge_request: 39092
|
||||
author:
|
||||
type: changed
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Add due_date filter param to Issues REST API
|
||||
merge_request: 38973
|
||||
author:
|
||||
type: added
|
||||
|
|
@ -72,6 +72,7 @@ GET /issues?confidential=true
|
|||
| `confidential` | boolean | no | Filter confidential or public issues. |
|
||||
| `not` | Hash | no | Return issues that do not match the parameters supplied. Accepts: `labels`, `milestone`, `author_id`, `author_username`, `assignee_id`, `assignee_username`, `my_reaction_emoji` |
|
||||
| `non_archived` | boolean | no | Return issues only from non-archived projects. If `false`, response will return issues from both archived and non-archived projects. Default is `true`. _(Introduced in [GitLab 13.0](https://gitlab.com/gitlab-org/gitlab/-/issues/197170))_ |
|
||||
| `due_date` | string | no | Return issues that have no due date (`0`) or whose due date is this week, this month, between two weeks ago and next month, or which are overdue. Accepts: `0` (no due date), `overdue`, `week`, `month`, `next_month_and_previous_two_weeks`. _(Introduced in [GitLab 13.3](https://gitlab.com/gitlab-org/gitlab/-/issues/233420))_ |
|
||||
|
||||
```shell
|
||||
curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/issues"
|
||||
|
|
@ -231,6 +232,7 @@ GET /groups/:id/issues?confidential=true
|
|||
| `confidential` | boolean | no | Filter confidential or public issues. |
|
||||
| `not` | Hash | no | Return issues that do not match the parameters supplied. Accepts: `labels`, `milestone`, `author_id`, `author_username`, `assignee_id`, `assignee_username`, `my_reaction_emoji`, `search`, `in` |
|
||||
| `non_archived` | boolean | no | Return issues from non archived projects. Default is true. _(Introduced in [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23785))_ |
|
||||
| `due_date` | string | no | Return issues that have no due date (`0`) or whose due date is this week, this month, between two weeks ago and next month, or which are overdue. Accepts: `0` (no due date), `overdue`, `week`, `month`, `next_month_and_previous_two_weeks`. _(Introduced in [GitLab 13.3](https://gitlab.com/gitlab-org/gitlab/-/issues/233420))_ |
|
||||
|
||||
```shell
|
||||
curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/4/issues"
|
||||
|
|
@ -388,6 +390,7 @@ GET /projects/:id/issues?confidential=true
|
|||
| `updated_before` | datetime | no | Return issues updated on or before the given time |
|
||||
| `confidential` | boolean | no | Filter confidential or public issues. |
|
||||
| `not` | Hash | no | Return issues that do not match the parameters supplied. Accepts: `labels`, `milestone`, `author_id`, `author_username`, `assignee_id`, `assignee_username`, `my_reaction_emoji`, `search`, `in` |
|
||||
| `due_date` | string | no | Return issues that have no due date (`0`) or whose due date is this week, this month, between two weeks ago and next month, or which are overdue. Accepts: `0` (no due date), `overdue`, `week`, `month`, `next_month_and_previous_two_weeks`. _(Introduced in [GitLab 13.3](https://gitlab.com/gitlab-org/gitlab/-/issues/233420))_ |
|
||||
|
||||
```shell
|
||||
curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/4/issues"
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@ module API
|
|||
desc: 'Return issues ordered by `created_at` or `updated_at` fields.'
|
||||
optional :sort, type: String, values: %w[asc desc], default: 'desc',
|
||||
desc: 'Return issues sorted in `asc` or `desc` order.'
|
||||
optional :due_date, type: String, values: %w[0 overdue week month next_month_and_previous_two_weeks],
|
||||
desc: 'Return issues that have no due date (`0`), or whose due date is this week, this month, between two weeks ago and next month, or which are overdue. Accepts: `overdue`, `week`, `month`, `next_month_and_previous_two_weeks`, `0`'
|
||||
|
||||
use :issues_stats_params
|
||||
use :pagination
|
||||
|
|
|
|||
|
|
@ -4775,7 +4775,7 @@ msgstr ""
|
|||
msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions."
|
||||
msgstr ""
|
||||
|
||||
msgid "Choose what content you want to see on a group’s overview page"
|
||||
msgid "Choose what content you want to see on a group’s overview page."
|
||||
msgstr ""
|
||||
|
||||
msgid "Choose which repositories you want to connect and run CI/CD pipelines."
|
||||
|
|
@ -13034,7 +13034,7 @@ msgstr ""
|
|||
msgid "Install on clusters"
|
||||
msgstr ""
|
||||
|
||||
msgid "Installation Commands"
|
||||
msgid "Installation"
|
||||
msgstr ""
|
||||
|
||||
msgid "Installed"
|
||||
|
|
@ -17155,9 +17155,6 @@ msgstr ""
|
|||
msgid "PackageRegistry|If you haven't already done so, you will need to add the below to your %{codeStart}pom.xml%{codeEnd} file."
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageRegistry|Installation"
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageRegistry|Is your favorite package manager missing? We'd love your help in building first-class support for it into GitLab! %{contributionLinkStart}Visit the contribution documentation%{contributionLinkEnd} to learn more about how to build support for new package managers into GitLab. Below is a list of package managers that are on our radar."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -17206,9 +17203,6 @@ msgstr ""
|
|||
msgid "PackageRegistry|Recipe: %{recipe}"
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageRegistry|Registry Setup"
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageRegistry|Remove package"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -17263,13 +17257,13 @@ msgstr ""
|
|||
msgid "PackageRegistry|composer.json require package include"
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageRegistry|npm"
|
||||
msgid "PackageRegistry|npm command"
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageRegistry|published by %{author}"
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageRegistry|yarn"
|
||||
msgid "PackageRegistry|yarn command"
|
||||
msgstr ""
|
||||
|
||||
msgid "PackageType|Composer"
|
||||
|
|
@ -18070,15 +18064,15 @@ msgstr ""
|
|||
msgid "Preferences|Choose what content you want to see on a project’s overview page."
|
||||
msgstr ""
|
||||
|
||||
msgid "Preferences|Choose what content you want to see on your homepage."
|
||||
msgstr ""
|
||||
|
||||
msgid "Preferences|Customize integrations with third party services."
|
||||
msgstr ""
|
||||
|
||||
msgid "Preferences|Customize the appearance of the application header and navigation sidebar."
|
||||
msgstr ""
|
||||
|
||||
msgid "Preferences|Default dashboard"
|
||||
msgstr ""
|
||||
|
||||
msgid "Preferences|Display time in 24-hour format"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -18088,6 +18082,9 @@ msgstr ""
|
|||
msgid "Preferences|For example: 30 mins ago."
|
||||
msgstr ""
|
||||
|
||||
msgid "Preferences|Homepage content"
|
||||
msgstr ""
|
||||
|
||||
msgid "Preferences|Instead of all the files changed, show only one file at a time. To switch between files, use the file browser."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -20031,6 +20028,9 @@ msgstr ""
|
|||
msgid "Registration|Your profile"
|
||||
msgstr ""
|
||||
|
||||
msgid "Registry setup"
|
||||
msgstr ""
|
||||
|
||||
msgid "Regulate approvals by authors/committers, based on compliance frameworks. Can be changed only at the instance level."
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`ConanInstallation renders all the messages 1`] = `
|
||||
<div>
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Installation
|
||||
</h3>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
|
||||
Conan Command
|
||||
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy Conan Command"
|
||||
instruction="foo/command"
|
||||
trackingaction="copy_conan_command"
|
||||
/>
|
||||
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Registry setup
|
||||
</h3>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
|
||||
Add Conan Remote
|
||||
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy Conan Setup Command"
|
||||
instruction="foo/setup"
|
||||
trackingaction="copy_conan_setup_command"
|
||||
/>
|
||||
|
||||
<gl-sprintf-stub
|
||||
message="For more information on the Conan registry, %{linkStart}see the documentation%{linkEnd}."
|
||||
/>
|
||||
</div>
|
||||
`;
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`MavenInstallation renders all the messages 1`] = `
|
||||
<div>
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Installation
|
||||
</h3>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
|
||||
Maven XML
|
||||
|
||||
</h4>
|
||||
|
||||
<p>
|
||||
<gl-sprintf-stub
|
||||
message="Copy and paste this inside your %{codeStart}pom.xml%{codeEnd} %{codeStart}dependencies%{codeEnd} block."
|
||||
/>
|
||||
</p>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy Maven XML"
|
||||
instruction="foo/xml"
|
||||
multiline="true"
|
||||
trackingaction="copy_maven_xml"
|
||||
/>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
|
||||
Maven Command
|
||||
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy Maven command"
|
||||
instruction="foo/command"
|
||||
trackingaction="copy_maven_command"
|
||||
/>
|
||||
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Registry setup
|
||||
</h3>
|
||||
|
||||
<p>
|
||||
<gl-sprintf-stub
|
||||
message="If you haven't already done so, you will need to add the below to your %{codeStart}pom.xml%{codeEnd} file."
|
||||
/>
|
||||
</p>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy Maven registry XML"
|
||||
instruction="foo/setup"
|
||||
multiline="true"
|
||||
trackingaction="copy_maven_setup_xml"
|
||||
/>
|
||||
|
||||
<gl-sprintf-stub
|
||||
message="For more information on the Maven registry, %{linkStart}see the documentation%{linkEnd}."
|
||||
/>
|
||||
</div>
|
||||
`;
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`NpmInstallation renders all the messages 1`] = `
|
||||
<div>
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Installation
|
||||
</h3>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
npm command
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy npm command"
|
||||
instruction="npm i @Test/package"
|
||||
trackingaction="copy_npm_install_command"
|
||||
/>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
yarn command
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy yarn command"
|
||||
instruction="yarn add @Test/package"
|
||||
trackingaction="copy_yarn_install_command"
|
||||
/>
|
||||
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Registry setup
|
||||
</h3>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
npm command
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy npm setup command"
|
||||
instruction="echo @Test:registry=undefined >> .npmrc"
|
||||
trackingaction="copy_npm_setup_command"
|
||||
/>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
yarn command
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy yarn setup command"
|
||||
instruction="echo \\\\\\"@Test:registry\\\\\\" \\\\\\"undefined\\\\\\" >> .yarnrc"
|
||||
trackingaction="copy_yarn_setup_command"
|
||||
/>
|
||||
|
||||
<gl-sprintf-stub
|
||||
message="You may also need to setup authentication using an auth token. %{linkStart}See the documentation%{linkEnd} to find out more."
|
||||
/>
|
||||
</div>
|
||||
`;
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`NugetInstallation renders all the messages 1`] = `
|
||||
<div>
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Installation
|
||||
</h3>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
|
||||
NuGet Command
|
||||
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy NuGet Command"
|
||||
instruction="foo/command"
|
||||
trackingaction="copy_nuget_install_command"
|
||||
/>
|
||||
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Registry setup
|
||||
</h3>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
|
||||
Add NuGet Source
|
||||
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy NuGet Setup Command"
|
||||
instruction="foo/setup"
|
||||
trackingaction="copy_nuget_setup_command"
|
||||
/>
|
||||
|
||||
<gl-sprintf-stub
|
||||
message="For more information on the NuGet registry, %{linkStart}see the documentation%{linkEnd}."
|
||||
/>
|
||||
</div>
|
||||
`;
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`PypiInstallation renders all the messages 1`] = `
|
||||
<div>
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Installation
|
||||
</h3>
|
||||
|
||||
<h4
|
||||
class="gl-font-base"
|
||||
>
|
||||
|
||||
Pip Command
|
||||
|
||||
</h4>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy Pip command"
|
||||
data-testid="pip-command"
|
||||
instruction="pip install"
|
||||
trackingaction="copy_pip_install_command"
|
||||
/>
|
||||
|
||||
<h3
|
||||
class="gl-font-lg"
|
||||
>
|
||||
Registry setup
|
||||
</h3>
|
||||
|
||||
<p>
|
||||
<gl-sprintf-stub
|
||||
message="If you haven't already done so, you will need to add the below to your %{codeStart}.pypirc%{codeEnd} file."
|
||||
/>
|
||||
</p>
|
||||
|
||||
<code-instruction-stub
|
||||
copytext="Copy .pypirc content"
|
||||
data-testid="pypi-setup-content"
|
||||
instruction="python setup"
|
||||
multiline="true"
|
||||
trackingaction="copy_pypi_setup_command"
|
||||
/>
|
||||
|
||||
<gl-sprintf-stub
|
||||
message="For more information on the PyPi registry, %{linkStart}see the documentation%{linkEnd}."
|
||||
/>
|
||||
</div>
|
||||
`;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
import Vuex from 'vuex';
|
||||
import { mount, createLocalVue } from '@vue/test-utils';
|
||||
import { shallowMount, createLocalVue } from '@vue/test-utils';
|
||||
import ConanInstallation from '~/packages/details/components/conan_installation.vue';
|
||||
import CodeInstructions from '~/packages/details/components/code_instruction.vue';
|
||||
import { conanPackage as packageEntity } from '../../mock_data';
|
||||
import { registryUrl as conanPath } from '../mock_data';
|
||||
import { GlTabs } from '@gitlab/ui';
|
||||
|
||||
const localVue = createLocalVue();
|
||||
localVue.use(Vuex);
|
||||
|
|
@ -25,12 +25,10 @@ describe('ConanInstallation', () => {
|
|||
},
|
||||
});
|
||||
|
||||
const findTabs = () => wrapper.find(GlTabs);
|
||||
const conanInstallationCommand = () => wrapper.find('.js-conan-command > input');
|
||||
const conanSetupCommand = () => wrapper.find('.js-conan-setup > input');
|
||||
const findCodeInstructions = () => wrapper.findAll(CodeInstructions);
|
||||
|
||||
function createComponent() {
|
||||
wrapper = mount(ConanInstallation, {
|
||||
wrapper = shallowMount(ConanInstallation, {
|
||||
localVue,
|
||||
store,
|
||||
});
|
||||
|
|
@ -44,21 +42,27 @@ describe('ConanInstallation', () => {
|
|||
if (wrapper) wrapper.destroy();
|
||||
});
|
||||
|
||||
describe('it renders', () => {
|
||||
it('with GlTabs', () => {
|
||||
expect(findTabs().exists()).toBe(true);
|
||||
});
|
||||
it('renders all the messages', () => {
|
||||
expect(wrapper.element).toMatchSnapshot();
|
||||
});
|
||||
|
||||
describe('installation commands', () => {
|
||||
it('renders the correct command', () => {
|
||||
expect(conanInstallationCommand().element.value).toBe(conanInstallationCommandStr);
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(0)
|
||||
.props('instruction'),
|
||||
).toBe(conanInstallationCommandStr);
|
||||
});
|
||||
});
|
||||
|
||||
describe('setup commands', () => {
|
||||
it('renders the correct command', () => {
|
||||
expect(conanSetupCommand().element.value).toBe(conanSetupCommandStr);
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(1)
|
||||
.props('instruction'),
|
||||
).toBe(conanSetupCommandStr);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
import { mount } from '@vue/test-utils';
|
||||
import InstallationTabs from '~/packages/details/components/installation_tabs.vue';
|
||||
import Tracking from '~/tracking';
|
||||
import { TrackingActions } from '~/packages/details/constants';
|
||||
|
||||
describe('InstallationTabs', () => {
|
||||
let wrapper;
|
||||
let eventSpy;
|
||||
|
||||
const trackingLabel = 'foo';
|
||||
|
||||
function createComponent() {
|
||||
wrapper = mount(InstallationTabs, {
|
||||
propsData: {
|
||||
trackingLabel,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
const installationTab = () => wrapper.find('.js-installation-tab > a');
|
||||
const setupTab = () => wrapper.find('.js-setup-tab > a');
|
||||
|
||||
beforeEach(() => {
|
||||
eventSpy = jest.spyOn(Tracking, 'event');
|
||||
createComponent();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
wrapper.destroy();
|
||||
wrapper = null;
|
||||
});
|
||||
|
||||
describe('tab change tracking', () => {
|
||||
it('should track when the setup tab is clicked', () => {
|
||||
setupTab().trigger('click');
|
||||
|
||||
return wrapper.vm.$nextTick().then(() => {
|
||||
expect(eventSpy).toHaveBeenCalledWith(undefined, TrackingActions.REGISTRY_SETUP, {
|
||||
label: trackingLabel,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it('should track when the installation tab is clicked', () => {
|
||||
setupTab().trigger('click');
|
||||
|
||||
return wrapper.vm
|
||||
.$nextTick()
|
||||
.then(() => {
|
||||
installationTab().trigger('click');
|
||||
})
|
||||
.then(() => {
|
||||
expect(eventSpy).toHaveBeenCalledWith(undefined, TrackingActions.INSTALLATION, {
|
||||
label: trackingLabel,
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
import Vuex from 'vuex';
|
||||
import { mount, createLocalVue } from '@vue/test-utils';
|
||||
import { shallowMount, createLocalVue } from '@vue/test-utils';
|
||||
import MavenInstallation from '~/packages/details/components/maven_installation.vue';
|
||||
import { registryUrl as mavenPath } from '../mock_data';
|
||||
import { mavenPackage as packageEntity } from '../../mock_data';
|
||||
import { GlTabs } from '@gitlab/ui';
|
||||
import CodeInstructions from '~/packages/details/components/code_instruction.vue';
|
||||
import { registryUrl as mavenPath } from 'jest/packages/details/mock_data';
|
||||
import { mavenPackage as packageEntity } from 'jest/packages/mock_data';
|
||||
import { TrackingActions } from '~/packages/details/constants';
|
||||
|
||||
const localVue = createLocalVue();
|
||||
localVue.use(Vuex);
|
||||
|
|
@ -27,13 +28,10 @@ describe('MavenInstallation', () => {
|
|||
},
|
||||
});
|
||||
|
||||
const findTabs = () => wrapper.find(GlTabs);
|
||||
const xmlCode = () => wrapper.find('.js-maven-xml > pre');
|
||||
const mavenCommand = () => wrapper.find('.js-maven-command > input');
|
||||
const xmlSetup = () => wrapper.find('.js-maven-setup-xml > pre');
|
||||
const findCodeInstructions = () => wrapper.findAll(CodeInstructions);
|
||||
|
||||
function createComponent() {
|
||||
wrapper = mount(MavenInstallation, {
|
||||
wrapper = shallowMount(MavenInstallation, {
|
||||
localVue,
|
||||
store,
|
||||
});
|
||||
|
|
@ -47,25 +45,47 @@ describe('MavenInstallation', () => {
|
|||
if (wrapper) wrapper.destroy();
|
||||
});
|
||||
|
||||
describe('it renders', () => {
|
||||
it('with GlTabs', () => {
|
||||
expect(findTabs().exists()).toBe(true);
|
||||
});
|
||||
it('renders all the messages', () => {
|
||||
expect(wrapper.element).toMatchSnapshot();
|
||||
});
|
||||
|
||||
describe('installation commands', () => {
|
||||
it('renders the correct xml block', () => {
|
||||
expect(xmlCode().text()).toBe(xmlCodeBlock);
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(0)
|
||||
.props(),
|
||||
).toMatchObject({
|
||||
instruction: xmlCodeBlock,
|
||||
multiline: true,
|
||||
trackingAction: TrackingActions.COPY_MAVEN_XML,
|
||||
});
|
||||
});
|
||||
|
||||
it('renders the correct maven command', () => {
|
||||
expect(mavenCommand().element.value).toBe(mavenCommandStr);
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(1)
|
||||
.props(),
|
||||
).toMatchObject({
|
||||
instruction: mavenCommandStr,
|
||||
multiline: false,
|
||||
trackingAction: TrackingActions.COPY_MAVEN_COMMAND,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('setup commands', () => {
|
||||
it('renders the correct xml block', () => {
|
||||
expect(xmlSetup().text()).toBe(mavenSetupXml);
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(2)
|
||||
.props(),
|
||||
).toMatchObject({
|
||||
instruction: mavenSetupXml,
|
||||
multiline: true,
|
||||
trackingAction: TrackingActions.COPY_MAVEN_SETUP,
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
import Vuex from 'vuex';
|
||||
import { mount, createLocalVue } from '@vue/test-utils';
|
||||
import { shallowMount, createLocalVue } from '@vue/test-utils';
|
||||
import NpmInstallation from '~/packages/details/components/npm_installation.vue';
|
||||
import { npmPackage as packageEntity } from '../../mock_data';
|
||||
import { registryUrl as nugetPath } from '../mock_data';
|
||||
import { GlTabs } from '@gitlab/ui';
|
||||
import CodeInstructions from '~/packages/details/components/code_instruction.vue';
|
||||
import { npmPackage as packageEntity } from 'jest/packages/mock_data';
|
||||
import { registryUrl as nugetPath } from 'jest/packages/details/mock_data';
|
||||
import { TrackingActions } from '~/packages/details/constants';
|
||||
import { npmInstallationCommand, npmSetupCommand } from '~/packages/details/store/getters';
|
||||
|
||||
const localVue = createLocalVue();
|
||||
localVue.use(Vuex);
|
||||
|
|
@ -11,30 +13,21 @@ localVue.use(Vuex);
|
|||
describe('NpmInstallation', () => {
|
||||
let wrapper;
|
||||
|
||||
const npmCommandStr = 'npm install';
|
||||
const npmSetupStr = 'npm setup';
|
||||
const yarnCommandStr = 'npm install';
|
||||
const yarnSetupStr = 'npm setup';
|
||||
const findCodeInstructions = () => wrapper.findAll(CodeInstructions);
|
||||
|
||||
const findTabs = () => wrapper.find(GlTabs);
|
||||
const npmInstallationCommand = () => wrapper.find('.js-npm-install > input');
|
||||
const npmSetupCommand = () => wrapper.find('.js-npm-setup > input');
|
||||
const yarnInstallationCommand = () => wrapper.find('.js-yarn-install > input');
|
||||
const yarnSetupCommand = () => wrapper.find('.js-yarn-setup > input');
|
||||
|
||||
function createComponent(yarn = false) {
|
||||
function createComponent() {
|
||||
const store = new Vuex.Store({
|
||||
state: {
|
||||
packageEntity,
|
||||
nugetPath,
|
||||
},
|
||||
getters: {
|
||||
npmInstallationCommand: () => () => (yarn ? yarnCommandStr : npmCommandStr),
|
||||
npmSetupCommand: () => () => (yarn ? yarnSetupStr : npmSetupStr),
|
||||
npmInstallationCommand,
|
||||
npmSetupCommand,
|
||||
},
|
||||
});
|
||||
|
||||
wrapper = mount(NpmInstallation, {
|
||||
wrapper = shallowMount(NpmInstallation, {
|
||||
localVue,
|
||||
store,
|
||||
});
|
||||
|
|
@ -48,33 +41,59 @@ describe('NpmInstallation', () => {
|
|||
if (wrapper) wrapper.destroy();
|
||||
});
|
||||
|
||||
describe('it renders', () => {
|
||||
it('with GlTabs', () => {
|
||||
expect(findTabs().exists()).toBe(true);
|
||||
it('renders all the messages', () => {
|
||||
expect(wrapper.element).toMatchSnapshot();
|
||||
});
|
||||
|
||||
describe('installation commands', () => {
|
||||
it('renders the correct npm command', () => {
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(0)
|
||||
.props(),
|
||||
).toMatchObject({
|
||||
instruction: 'npm i @Test/package',
|
||||
multiline: false,
|
||||
trackingAction: TrackingActions.COPY_NPM_INSTALL_COMMAND,
|
||||
});
|
||||
});
|
||||
|
||||
it('renders the correct yarn command', () => {
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(1)
|
||||
.props(),
|
||||
).toMatchObject({
|
||||
instruction: 'yarn add @Test/package',
|
||||
multiline: false,
|
||||
trackingAction: TrackingActions.COPY_YARN_INSTALL_COMMAND,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('npm commands', () => {
|
||||
it('renders the correct install command', () => {
|
||||
expect(npmInstallationCommand().element.value).toBe(npmCommandStr);
|
||||
describe('setup commands', () => {
|
||||
it('renders the correct npm command', () => {
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(2)
|
||||
.props(),
|
||||
).toMatchObject({
|
||||
instruction: 'echo @Test:registry=undefined >> .npmrc',
|
||||
multiline: false,
|
||||
trackingAction: TrackingActions.COPY_NPM_SETUP_COMMAND,
|
||||
});
|
||||
});
|
||||
|
||||
it('renders the correct setup command', () => {
|
||||
expect(npmSetupCommand().element.value).toBe(npmSetupStr);
|
||||
});
|
||||
});
|
||||
|
||||
describe('yarn commands', () => {
|
||||
beforeEach(() => {
|
||||
createComponent(true);
|
||||
});
|
||||
|
||||
it('renders the correct install command', () => {
|
||||
expect(yarnInstallationCommand().element.value).toBe(yarnCommandStr);
|
||||
});
|
||||
|
||||
it('renders the correct setup command', () => {
|
||||
expect(yarnSetupCommand().element.value).toBe(yarnSetupStr);
|
||||
it('renders the correct yarn command', () => {
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(3)
|
||||
.props(),
|
||||
).toMatchObject({
|
||||
instruction: 'echo \\"@Test:registry\\" \\"undefined\\" >> .yarnrc',
|
||||
multiline: false,
|
||||
trackingAction: TrackingActions.COPY_YARN_SETUP_COMMAND,
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
import Vuex from 'vuex';
|
||||
import { mount, createLocalVue } from '@vue/test-utils';
|
||||
import { shallowMount, createLocalVue } from '@vue/test-utils';
|
||||
import NugetInstallation from '~/packages/details/components/nuget_installation.vue';
|
||||
import { nugetPackage as packageEntity } from '../../mock_data';
|
||||
import { registryUrl as nugetPath } from '../mock_data';
|
||||
import { GlTabs } from '@gitlab/ui';
|
||||
import CodeInstructions from '~/packages/details/components/code_instruction.vue';
|
||||
import { nugetPackage as packageEntity } from 'jest/packages/mock_data';
|
||||
import { registryUrl as nugetPath } from 'jest/packages/details/mock_data';
|
||||
import { TrackingActions } from '~/packages/details/constants';
|
||||
|
||||
const localVue = createLocalVue();
|
||||
localVue.use(Vuex);
|
||||
|
|
@ -25,12 +26,10 @@ describe('NugetInstallation', () => {
|
|||
},
|
||||
});
|
||||
|
||||
const findTabs = () => wrapper.find(GlTabs);
|
||||
const nugetInstallationCommand = () => wrapper.find('.js-nuget-command > input');
|
||||
const nugetSetupCommand = () => wrapper.find('.js-nuget-setup > input');
|
||||
const findCodeInstructions = () => wrapper.findAll(CodeInstructions);
|
||||
|
||||
function createComponent() {
|
||||
wrapper = mount(NugetInstallation, {
|
||||
wrapper = shallowMount(NugetInstallation, {
|
||||
localVue,
|
||||
store,
|
||||
});
|
||||
|
|
@ -44,21 +43,33 @@ describe('NugetInstallation', () => {
|
|||
if (wrapper) wrapper.destroy();
|
||||
});
|
||||
|
||||
describe('it renders', () => {
|
||||
it('with GlTabs', () => {
|
||||
expect(findTabs().exists()).toBe(true);
|
||||
});
|
||||
it('renders all the messages', () => {
|
||||
expect(wrapper.element).toMatchSnapshot();
|
||||
});
|
||||
|
||||
describe('installation commands', () => {
|
||||
it('renders the correct command', () => {
|
||||
expect(nugetInstallationCommand().element.value).toBe(nugetInstallationCommandStr);
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(0)
|
||||
.props(),
|
||||
).toMatchObject({
|
||||
instruction: nugetInstallationCommandStr,
|
||||
trackingAction: TrackingActions.COPY_NUGET_INSTALL_COMMAND,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('setup commands', () => {
|
||||
it('renders the correct command', () => {
|
||||
expect(nugetSetupCommand().element.value).toBe(nugetSetupCommandStr);
|
||||
expect(
|
||||
findCodeInstructions()
|
||||
.at(1)
|
||||
.props(),
|
||||
).toMatchObject({
|
||||
instruction: nugetSetupCommandStr,
|
||||
trackingAction: TrackingActions.COPY_NUGET_SETUP_COMMAND,
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
import Vuex from 'vuex';
|
||||
import { shallowMount, createLocalVue } from '@vue/test-utils';
|
||||
import PypiInstallation from '~/packages/details/components/pypi_installation.vue';
|
||||
import InstallationTabs from '~/packages/details/components/installation_tabs.vue';
|
||||
import { pypiPackage as packageEntity } from '../../mock_data';
|
||||
import { GlTabs } from '@gitlab/ui';
|
||||
import { pypiPackage as packageEntity } from 'jest/packages/mock_data';
|
||||
|
||||
const localVue = createLocalVue();
|
||||
localVue.use(Vuex);
|
||||
|
|
@ -25,7 +23,6 @@ describe('PypiInstallation', () => {
|
|||
},
|
||||
});
|
||||
|
||||
const findTabs = () => wrapper.find(GlTabs);
|
||||
const pipCommand = () => wrapper.find('[data-testid="pip-command"]');
|
||||
const setupInstruction = () => wrapper.find('[data-testid="pypi-setup-content"]');
|
||||
|
||||
|
|
@ -33,9 +30,6 @@ describe('PypiInstallation', () => {
|
|||
wrapper = shallowMount(PypiInstallation, {
|
||||
localVue,
|
||||
store,
|
||||
stubs: {
|
||||
InstallationTabs,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -48,10 +42,8 @@ describe('PypiInstallation', () => {
|
|||
wrapper = null;
|
||||
});
|
||||
|
||||
describe('it renders', () => {
|
||||
it('with GlTabs', () => {
|
||||
expect(findTabs().exists()).toBe(true);
|
||||
});
|
||||
it('renders all the messages', () => {
|
||||
expect(wrapper.element).toMatchSnapshot();
|
||||
});
|
||||
|
||||
describe('installation commands', () => {
|
||||
|
|
|
|||
|
|
@ -387,6 +387,54 @@ RSpec.describe API::Issues do
|
|||
end
|
||||
end
|
||||
|
||||
context 'filtering by due date' do
|
||||
# This date chosen because it is the beginning of a week + near the beginning of a month
|
||||
let_it_be(:frozen_time) { DateTime.parse('2020-08-03 12:00') }
|
||||
|
||||
let_it_be(:issue2) { create(:issue, project: project, author: user, due_date: frozen_time + 3.days) }
|
||||
let_it_be(:issue3) { create(:issue, project: project, author: user, due_date: frozen_time + 10.days) }
|
||||
let_it_be(:issue4) { create(:issue, project: project, author: user, due_date: frozen_time + 34.days) }
|
||||
let_it_be(:issue5) { create(:issue, project: project, author: user, due_date: frozen_time - 8.days) }
|
||||
|
||||
before do
|
||||
travel_to(frozen_time)
|
||||
end
|
||||
|
||||
after do
|
||||
travel_back
|
||||
end
|
||||
|
||||
it 'returns issues without due date' do
|
||||
get api('/issues?due_date=0', user)
|
||||
|
||||
expect_paginated_array_response(issue.id, closed_issue.id)
|
||||
end
|
||||
|
||||
it 'returns issues due for this week' do
|
||||
get api('/issues?due_date=week', user)
|
||||
|
||||
expect_paginated_array_response(issue2.id)
|
||||
end
|
||||
|
||||
it 'returns issues due for this month' do
|
||||
get api('/issues?due_date=month', user)
|
||||
|
||||
expect_paginated_array_response(issue3.id, issue2.id)
|
||||
end
|
||||
|
||||
it 'returns issues that are due previous two weeks and next month' do
|
||||
get api('/issues?due_date=next_month_and_previous_two_weeks', user)
|
||||
|
||||
expect_paginated_array_response(issue5.id, issue4.id, issue3.id, issue2.id)
|
||||
end
|
||||
|
||||
it 'returns issues that are overdue' do
|
||||
get api('/issues?due_date=overdue', user)
|
||||
|
||||
expect_paginated_array_response(issue5.id)
|
||||
end
|
||||
end
|
||||
|
||||
context 'filter by labels or label_name param' do
|
||||
context 'N+1' do
|
||||
let(:label_b) { create(:label, title: 'foo', project: project) }
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ RSpec.shared_examples 'package details link' do |property|
|
|||
|
||||
page.within('[data-qa-selector="package_information_content"]') do
|
||||
expect(page).to have_content('Installation')
|
||||
expect(page).to have_content('Registry Setup')
|
||||
expect(page).to have_content('Registry setup')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -20,6 +20,15 @@ RSpec.describe 'profiles/preferences/show' do
|
|||
it 'has option for Render whitespace characters in the Web IDE' do
|
||||
expect(rendered).to have_unchecked_field('Render whitespace characters in the Web IDE')
|
||||
end
|
||||
|
||||
it 'has an id for anchoring on behavior' do
|
||||
expect(rendered).to have_css('#behavior')
|
||||
end
|
||||
|
||||
it 'has helpful homepage setup guidance' do
|
||||
expect(rendered).to have_field('Homepage content')
|
||||
expect(rendered).to have_content('Choose what content you want to see on your homepage.')
|
||||
end
|
||||
end
|
||||
|
||||
context 'sourcegraph' do
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Leiningen.gitignore
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
pom.xml
|
||||
pom.xml.asc
|
||||
*.jar
|
||||
*.class
|
||||
/lib/
|
||||
/classes/
|
||||
/target/
|
||||
/checkouts/
|
||||
.lein-deps-sum
|
||||
.lein-repl-history
|
||||
.lein-plugins/
|
||||
.lein-failures
|
||||
.nrepl-port
|
||||
.cpcache/
|
||||
|
|
@ -1 +0,0 @@
|
|||
C++.gitignore
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
# Prerequisites
|
||||
*.d
|
||||
|
||||
# Compiled Object files
|
||||
*.slo
|
||||
*.lo
|
||||
*.o
|
||||
*.obj
|
||||
|
||||
# Precompiled Headers
|
||||
*.gch
|
||||
*.pch
|
||||
|
||||
# Compiled Dynamic libraries
|
||||
*.so
|
||||
*.dylib
|
||||
*.dll
|
||||
|
||||
# Fortran module files
|
||||
*.mod
|
||||
*.smod
|
||||
|
||||
# Compiled Static libraries
|
||||
*.lai
|
||||
*.la
|
||||
*.a
|
||||
*.lib
|
||||
|
||||
# Executables
|
||||
*.exe
|
||||
*.out
|
||||
*.app
|
||||
|
|
@ -1 +0,0 @@
|
|||
Java.gitignore
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Mobile Tools for Java (J2ME)
|
||||
.mtj.tmp/
|
||||
|
||||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.nar
|
||||
*.ear
|
||||
*.zip
|
||||
*.tar.gz
|
||||
*.rar
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
hs_err_pid*
|
||||
Loading…
Reference in New Issue