Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
58d68e313f
commit
933a571ac8
|
@ -525,8 +525,8 @@ conflicting_permanent_redirects.destroy_all
|
||||||
### Close a merge request properly (if merged but still marked as open)
|
### Close a merge request properly (if merged but still marked as open)
|
||||||
|
|
||||||
```ruby
|
```ruby
|
||||||
p = Project.find_by_full_path('')
|
p = Project.find_by_full_path('<full/path/to/project>')
|
||||||
m = project.merge_requests.find_by(iid: )
|
m = p.merge_requests.find_by(iid: <iid>)
|
||||||
u = User.find_by_username('')
|
u = User.find_by_username('')
|
||||||
MergeRequests::PostMergeService.new(p, u).execute(m)
|
MergeRequests::PostMergeService.new(p, u).execute(m)
|
||||||
```
|
```
|
||||||
|
|
|
@ -104,8 +104,8 @@ of complexity, maintenance cost and enormous, negative impact on availability.
|
||||||
|
|
||||||
1. ✓ Implement the new architecture in way that it does not depend on shared local storage
|
1. ✓ Implement the new architecture in way that it does not depend on shared local storage
|
||||||
1. ✓ Evaluate performance and edge-cases, iterate to improve the new architecture
|
1. ✓ Evaluate performance and edge-cases, iterate to improve the new architecture
|
||||||
1. Design cloud native build logs correctness verification mechanisms
|
1. ✓ Design cloud native build logs correctness verification mechanisms
|
||||||
1. Build observability mechanisms around performance and correctness
|
1. ✓ Build observability mechanisms around performance and correctness
|
||||||
1. Rollout the feature into production environment incrementally
|
1. Rollout the feature into production environment incrementally
|
||||||
|
|
||||||
The work needed to make the new architecture production ready and enabled on
|
The work needed to make the new architecture production ready and enabled on
|
||||||
|
|
|
@ -72,3 +72,4 @@ To disable it:
|
||||||
|
|
||||||
```ruby
|
```ruby
|
||||||
Feature.disable(:gitpod)
|
Feature.disable(:gitpod)
|
||||||
|
```
|
||||||
|
|
|
@ -129,7 +129,7 @@ in the email, `%{ISSUE_PATH}` placeholder which will be replaced by
|
||||||
You can customize the email display name. Emails sent from Service Desk will have
|
You can customize the email display name. Emails sent from Service Desk will have
|
||||||
this name in the `From` header. The default display name is `GitLab Support Bot`.
|
this name in the `From` header. The default display name is `GitLab Support Bot`.
|
||||||
|
|
||||||
### Using custom email address
|
### Using custom email address **(CORE ONLY)**
|
||||||
|
|
||||||
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2201) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.0.
|
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/2201) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.0.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue