diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 09:08:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 09:08:58 +0300 |
commit | 18b8435318887d3fc6e9f9d305967a953cdd7d3f (patch) | |
tree | 28cb71f255eb364c224ff24dd085f8cd836951b1 /app/assets | |
parent | 4359b9650ecf0960f04f0fd38fc25bec7b478a11 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/clusters/components/applications.vue | 5 | ||||
-rw-r--r-- | app/assets/javascripts/repository/components/preview/index.vue | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 9429e10e6ed..685fc939c9a 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -638,13 +638,8 @@ Crossplane runs inside your Kubernetes cluster and supports secure connectivity :status-reason="applications.elastic_stack.statusReason" :request-status="applications.elastic_stack.requestStatus" :request-reason="applications.elastic_stack.requestReason" - :version="applications.elastic_stack.version" - :chart-repo="applications.elastic_stack.chartRepo" - :update-available="applications.elastic_stack.updateAvailable" :installed="applications.elastic_stack.installed" :install-failed="applications.elastic_stack.installFailed" - :update-successful="applications.elastic_stack.updateSuccessful" - :update-failed="applications.elastic_stack.updateFailed" :uninstallable="applications.elastic_stack.uninstallable" :uninstall-successful="applications.elastic_stack.uninstallSuccessful" :uninstall-failed="applications.elastic_stack.uninstallFailed" diff --git a/app/assets/javascripts/repository/components/preview/index.vue b/app/assets/javascripts/repository/components/preview/index.vue index 78ae719ba0d..99f100eaa60 100644 --- a/app/assets/javascripts/repository/components/preview/index.vue +++ b/app/assets/javascripts/repository/components/preview/index.vue @@ -2,6 +2,7 @@ import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; import { GlLink, GlLoadingIcon } from '@gitlab/ui'; +import { handleLocationHash } from '~/lib/utils/common_utils'; import getReadmeQuery from '../../queries/getReadme.query.graphql'; export default { @@ -36,6 +37,7 @@ export default { readme(newVal) { if (newVal) { this.$nextTick(() => { + handleLocationHash(); $(this.$refs.readme).renderGFM(); }); } |