kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-05-28 06:08:26 +00:00
parent 9c3e48166e
commit 616129d41c
10 changed files with 168 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/performance_bar/components/performance_bar_app.vue
View File

@ -57,6 +57,11 @@ export default {
header: s__('PerformanceBar|Redis calls'),
keys: ['cmd'],
},
{
metric: 'es',
header: s__('PerformanceBar|Elasticsearch calls'),
keys: ['request', 'body'],
},
{
metric: 'total',
header: s__('PerformanceBar|Frontend resources'),

1
config/initializers/peek.rb
View File

@ -9,6 +9,7 @@ Peek.into Peek::Views::Host
Peek.into Peek::Views::ActiveRecord
Peek.into Peek::Views::Gitaly
Peek.into Peek::Views::RedisDetailed
Peek.into Peek::Views::Elasticsearch
Peek.into Peek::Views::Rugged
Peek.into Peek::Views::BulletDetailed if defined?(Bullet)

22
doc/api/graphql/reference/gitlab_schema.graphql
View File

@ -8309,6 +8309,11 @@ type Project {
"""
after: String
"""
Filter requirements by author username
"""
authorUsername: [String!]
"""
Returns the elements in the list that come before the specified cursor.
"""
@ -8405,6 +8410,11 @@ type Project {
Find a single requirement. Available only when feature flag `requirements_management` is enabled.
"""
requirement(
"""
Filter requirements by author username
"""
authorUsername: [String!]
"""
IID of the requirement, e.g., "1"
"""
@ -8415,6 +8425,11 @@ type Project {
"""
iids: [ID!]
"""
Filter requirements by title search
"""
search: String
"""
List requirements by sort order
"""
@ -8465,6 +8480,11 @@ type Project {
"""
last: Int
"""
Filter requirements by title search
"""
search: String
"""
List requirements by sort order
"""
@ -9609,7 +9629,7 @@ type Repository {
}
"""
Represents a requirement.
Represents a requirement
"""
type Requirement {
"""

58
doc/api/graphql/reference/gitlab_schema.json
View File

@ -24398,6 +24398,34 @@
"ofType": null
},
"defaultValue": null
},
{
"name": "search",
"description": "Filter requirements by title search",
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "authorUsername",
"description": "Filter requirements by author username",
"type": {
"kind": "LIST",
"name": null,
"ofType": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "String",
"ofType": null
}
}
},
"defaultValue": null
}
],
"type": {
@ -24460,6 +24488,34 @@
},
"defaultValue": null
},
{
"name": "search",
"description": "Filter requirements by title search",
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"defaultValue": null
},
{
"name": "authorUsername",
"description": "Filter requirements by author username",
"type": {
"kind": "LIST",
"name": null,
"ofType": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "String",
"ofType": null
}
}
},
"defaultValue": null
},
{
"name": "after",
"description": "Returns the elements in the list that come after the specified cursor.",
@ -28132,7 +28188,7 @@
{
"kind": "OBJECT",
"name": "Requirement",
"description": "Represents a requirement.",
"description": "Represents a requirement",
"fields": [
{
"name": "author",

2
doc/api/graphql/reference/index.md
View File

@ -1356,7 +1356,7 @@ Autogenerated return type of RemoveProjectFromSecurityDashboard
## Requirement
Represents a requirement.
Represents a requirement
| Name | Type | Description |
| --- | ---- | ---------- |

24
doc/ci/cloud_deployment/index.md
View File

@ -13,7 +13,7 @@ that come with the needed libraries and tools pre-installed.
By referencing them in your CI/CD pipeline, you'll be able to interact with your chosen
cloud provider more easily.
## AWS
## Run AWS commands from GitLab CI/CD
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31167) in GitLab 12.6.
@ -49,23 +49,23 @@ Some credentials are required to be able to run `aws` commands:
```
NOTE: **Note:**
Please note that the image used in the example above
The image used in the example above
(`registry.gitlab.com/gitlab-org/cloud-deploy/aws-base:latest`) is hosted on the [GitLab
Container Registry](../../user/packages/container_registry/index.md) and is
ready to use. Alternatively, replace the image with another one hosted on [AWS ECR](#aws-ecr).
ready to use. Alternatively, replace the image with one hosted on AWS ECR.
### AWS ECR
## Use an AWS Elastic Container Registry (ECR) image in your CI/CD
Instead of referencing an image hosted on the GitLab Registry, you are free to
reference any other image hosted on any third-party registry, such as
Instead of referencing an image hosted on the GitLab Registry, you can
reference an image hosted on any third-party registry, such as the
[Amazon Elastic Container Registry (ECR)](https://aws.amazon.com/ecr/).
To do so, please make sure to [push your image into your ECR
repository](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-ecr-image.html)
before referencing it in your `.gitlab-ci.yml` file and replace the `image`
path to point to your ECR.
To do so, [push your image into your ECR
repository](https://docs.aws.amazon.com/AmazonECR/latest/userguide/docker-push-ecr-image.html).
Then reference it in your `.gitlab-ci.yml` file and replace the `image`
path to point to your ECR image.
### Deploy your application to AWS Elastic Container Service (ECS)
## Deploy your application to the AWS Elastic Container Service (ECS)
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207962) in GitLab 12.9.
@ -80,7 +80,7 @@ components, like an ECS service, ECS task definition, a database on AWS RDS, etc
After you're all set up on AWS ECS, follow these steps:
1. Make sure your AWS credentials are set up as environment variables for your
project. You can follow [the steps above](#aws) to complete this setup.
project. You can follow [the steps above](#run-aws-commands-from-gitlab-cicd) to complete this setup.
1. Add these variables to your project's `.gitlab-ci.yml` file:
```yaml

2
doc/topics/autodevops/index.md
View File

@ -225,7 +225,7 @@ Variable. To do so, follow these steps:
1. Give this variable the value `ECS` before saving it.
When you trigger a pipeline, if you have AutoDev Ops enabled and if you have correctly
[entered AWS credentials as environment variables](../../ci/cloud_deployment/index.md#deploy-your-application-to-aws-elastic-container-service-ecs),
[entered AWS credentials as environment variables](../../ci/cloud_deployment/index.md#deploy-your-application-to-the-aws-elastic-container-service-ecs),
your application will be deployed to AWS ECS.
NOTE: **Note:**

20
doc/user/project/requirements/index.md
View File

@ -73,3 +73,23 @@ You can view the list of archived requirements in the **Archived** tab.
To reopen an archived requirement, click **Reopen**.
As soon as a requirement is reopened, it no longer appears in the **Archived** tab.
## Search for a requirement from the requirements list page
> - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.1.
You can search for a requirement from the list of requirements using filtered search bar (similar to
that of Issues and Merge Requests) based on following parameters:
- Title
- Author username
To search, go to the list of requirements and click the field **Search or filter results**.
It will display a dropdown menu, from which you can add an author. You can also enter plain
text to search by epic title or description. When done, press <kbd>Enter</kbd> on your
keyboard to filter the list.
You can also sort requirements list by:
- Created date
- Last updated

47
lib/peek/views/elasticsearch.rb Normal file
View File

@ -0,0 +1,47 @@
# frozen_string_literal: true
module Peek
module Views
class Elasticsearch < DetailedView
DEFAULT_THRESHOLDS = {
calls: 5,
duration: 1000,
individual_call: 1000
}.freeze
THRESHOLDS = {
production: {
calls: 5,
duration: 1000,
individual_call: 1000
}
}.freeze
def key
'es'
end
def self.thresholds
@thresholds ||= THRESHOLDS.fetch(Rails.env.to_sym, DEFAULT_THRESHOLDS)
end
private
def duration
::Gitlab::Instrumentation::ElasticsearchTransport.query_time * 1000
end
def calls
::Gitlab::Instrumentation::ElasticsearchTransport.get_request_count
end
def call_details
::Gitlab::Instrumentation::ElasticsearchTransport.detail_store
end
def format_call_details(call)
super.merge(request: "#{call[:method]} #{call[:path]}")
end
end
end
end

3
locale/gitlab.pot
View File

@ -15513,6 +15513,9 @@ msgstr ""
msgid "PerformanceBar|Download"
msgstr ""
msgid "PerformanceBar|Elasticsearch calls"
msgstr ""
msgid "PerformanceBar|Frontend resources"
msgstr ""