Skip to content

Commit

Permalink
Add latest changes from gitlab-org/gitlab@master
Browse files Browse the repository at this point in the history
  • Loading branch information
GitLab Bot committed Mar 17, 2020
1 parent 8ae26d7 commit 8e12949
Show file tree
Hide file tree
Showing 21 changed files with 699 additions and 63 deletions.
5 changes: 5 additions & 0 deletions app/assets/javascripts/clusters/components/applications.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions app/assets/javascripts/clusters/stores/clusters_store.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
INSTALL_EVENT,
UPDATE_EVENT,
UNINSTALL_EVENT,
ELASTIC_STACK,
} from '../constants';
import transitionApplicationState from '../services/application_state_machine';

Expand Down Expand Up @@ -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;
}
});
}
Expand Down
11 changes: 11 additions & 0 deletions app/assets/javascripts/pages/registrations/new/index.js
Original file line number Diff line number Diff line change
@@ -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);
}
}
});
2 changes: 1 addition & 1 deletion app/models/clusters/applications/elastic_stack.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Clusters
module Applications
class ElasticStack < ApplicationRecord
VERSION = '1.8.0'
VERSION = '1.9.0'

ELASTICSEARCH_PORT = 9200

Expand Down
2 changes: 1 addition & 1 deletion app/services/git/process_ref_changes_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def change_action(change)
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:)
Expand Down
5 changes: 5 additions & 0 deletions changelogs/unreleased/ak-upgrade-es.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
title: Upgrade Elastic Stack helm chart to 1.9.0
merge_request: 27011
author:
type: changed
2 changes: 1 addition & 1 deletion config/initializers/sidekiq_cluster.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

if ENV['ENABLE_SIDEKIQ_CLUSTER'] && Gitlab.ee?
if ENV['ENABLE_SIDEKIQ_CLUSTER']
Thread.new do
Thread.current.abort_on_exception = true

Expand Down
6 changes: 6 additions & 0 deletions doc/administration/gitaly/praefect.md
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,12 @@ documentation](index.md#3-gitaly-server-configuration).
gitlab-ctl reconfigure
```

1. To ensure that Gitaly [has updated its Prometheus listen address](https://gitlab.com/gitlab-org/gitaly/-/issues/2521), [restart Gitaly](../restart_gitlab.md#omnibus-gitlab-restart):

```shell
gitlab-ctl restart gitaly
```

**Complete these steps for each Gitaly node!**

After all Gitaly nodes are configured, you can run the Praefect connection
Expand Down
129 changes: 129 additions & 0 deletions doc/api/graphql/reference/gitlab_schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,46 @@ type CreateNotePayload {
note: Note
}

"""
Autogenerated input type of CreateRequirement
"""
input CreateRequirementInput {
"""
A unique identifier for the client performing the mutation.
"""
clientMutationId: String

"""
The project full path the requirement is associated with
"""
projectPath: ID!

"""
Title of the requirement
"""
title: String!
}

"""
Autogenerated return type of CreateRequirement
"""
type CreateRequirementPayload {
"""
A unique identifier for the client performing the mutation.
"""
clientMutationId: String

"""
Reasons why the mutation failed.
"""
errors: [String!]!

"""
The requirement after mutation
"""
requirement: Requirement
}

"""
Autogenerated input type of CreateSnippet
"""
Expand Down Expand Up @@ -4952,6 +4992,7 @@ type Mutation {
createEpic(input: CreateEpicInput!): CreateEpicPayload
createImageDiffNote(input: CreateImageDiffNoteInput!): CreateImageDiffNotePayload
createNote(input: CreateNoteInput!): CreateNotePayload
createRequirement(input: CreateRequirementInput!): CreateRequirementPayload
createSnippet(input: CreateSnippetInput!): CreateSnippetPayload
designManagementDelete(input: DesignManagementDeleteInput!): DesignManagementDeletePayload
designManagementUpload(input: DesignManagementUploadInput!): DesignManagementUploadPayload
Expand Down Expand Up @@ -6574,6 +6615,94 @@ type Repository {
): Tree
}

"""
Represents a requirement.
"""
type Requirement {
"""
Author of the requirement
"""
author: User!

"""
Timestamp of when the requirement was created
"""
createdAt: Time!

"""
ID of the requirement
"""
id: ID!

"""
Internal ID of the requirement
"""
iid: ID!

"""
Project to which the requirement belongs
"""
project: Project!

"""
State of the requirement
"""
state: RequirementState!

"""
Title of the requirement
"""
title: String

"""
Timestamp of when the requirement was last updated
"""
updatedAt: Time!

"""
Permissions for the current user on the resource
"""
userPermissions: RequirementPermissions!
}

"""
Check permissions for the current user on a requirement
"""
type RequirementPermissions {
"""
Indicates the user can perform `admin_requirement` on this resource
"""
adminRequirement: Boolean!

"""
Indicates the user can perform `create_requirement` on this resource
"""
createRequirement: Boolean!

"""
Indicates the user can perform `destroy_requirement` on this resource
"""
destroyRequirement: Boolean!

"""
Indicates the user can perform `read_requirement` on this resource
"""
readRequirement: Boolean!

"""
Indicates the user can perform `update_requirement` on this resource
"""
updateRequirement: Boolean!
}

"""
State of a requirement
"""
enum RequirementState {
ARCHIVED
OPENED
}

type RootStorageStatistics {
"""
The CI artifacts size in bytes
Expand Down
Loading

0 comments on commit 8e12949

Please sign in to comment.