diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 18:09:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 18:09:10 +0300 |
commit | 8e129497b2565b8c595ef4f806d9a9595ca654e5 (patch) | |
tree | 7afeeca3ea58013c1e8c3a2055661bacf65577da /app | |
parent | 8ae26d705abe341b03bc15d4373d6cd0c77c0baf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
5 files changed, 22 insertions, 2 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 442c52110f2..87d190e51c4 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -634,8 +634,13 @@ 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/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js index 1d17170cea1..00ed939e3b4 100644 --- a/app/assets/javascripts/clusters/stores/clusters_store.js +++ b/app/assets/javascripts/clusters/stores/clusters_store.js @@ -12,6 +12,7 @@ import { INSTALL_EVENT, UPDATE_EVENT, UNINSTALL_EVENT, + ELASTIC_STACK, } from '../constants'; import transitionApplicationState from '../services/application_state_machine'; @@ -237,6 +238,9 @@ export default class ClusterStore { } else if (appId === RUNNER) { this.state.applications.runner.version = version; this.state.applications.runner.updateAvailable = updateAvailable; + } else if (appId === ELASTIC_STACK) { + this.state.applications.elastic_stack.version = version; + this.state.applications.elastic_stack.updateAvailable = updateAvailable; } }); } diff --git a/app/assets/javascripts/pages/registrations/new/index.js b/app/assets/javascripts/pages/registrations/new/index.js index a33d11f3613..4b4b0555bb2 100644 --- a/app/assets/javascripts/pages/registrations/new/index.js +++ b/app/assets/javascripts/pages/registrations/new/index.js @@ -1,9 +1,20 @@ import LengthValidator from '~/pages/sessions/new/length_validator'; import UsernameValidator from '~/pages/sessions/new/username_validator'; import NoEmojiValidator from '~/emoji/no_emoji_validator'; +import Tracking from '~/tracking'; document.addEventListener('DOMContentLoaded', () => { new UsernameValidator(); // eslint-disable-line no-new new LengthValidator(); // eslint-disable-line no-new new NoEmojiValidator(); // eslint-disable-line no-new }); + +document.addEventListener('SnowplowInitialized', () => { + if (gon.tracking_data) { + const { category, action } = gon.tracking_data; + + if (category && action) { + Tracking.event(category, action); + } + } +}); diff --git a/app/models/clusters/applications/elastic_stack.rb b/app/models/clusters/applications/elastic_stack.rb index f87d4e8ed49..afdc1c91c69 100644 --- a/app/models/clusters/applications/elastic_stack.rb +++ b/app/models/clusters/applications/elastic_stack.rb @@ -3,7 +3,7 @@ module Clusters module Applications class ElasticStack < ApplicationRecord - VERSION = '1.8.0' + VERSION = '1.9.0' ELASTICSEARCH_PORT = 9200 diff --git a/app/services/git/process_ref_changes_service.rb b/app/services/git/process_ref_changes_service.rb index 3052bed51bc..387cd29d69d 100644 --- a/app/services/git/process_ref_changes_service.rb +++ b/app/services/git/process_ref_changes_service.rb @@ -35,7 +35,7 @@ module Git end def execute_project_hooks?(changes) - (changes.size <= Gitlab::CurrentSettings.push_event_hooks_limit) || Feature.enabled?(:git_push_execute_all_project_hooks, project) + changes.size <= Gitlab::CurrentSettings.push_event_hooks_limit end def process_changes(ref_type, action, changes, execute_project_hooks:) |