From 933a571ac8c9ada219dd15079221ff3dba8043be Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 29 Sep 2020 12:10:12 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../troubleshooting/gitlab_rails_cheat_sheet.md | 4 ++-- doc/architecture/blueprints/cloud_native_build_logs/index.md | 4 ++-- doc/integration/gitpod.md | 1 + doc/user/project/service_desk.md | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md index 9a23a115765..b7bcde52a42 100644 --- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md +++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md @@ -525,8 +525,8 @@ conflicting_permanent_redirects.destroy_all ### Close a merge request properly (if merged but still marked as open) ```ruby -p = Project.find_by_full_path('') -m = project.merge_requests.find_by(iid: ) +p = Project.find_by_full_path('') +m = p.merge_requests.find_by(iid: ) u = User.find_by_username('') MergeRequests::PostMergeService.new(p, u).execute(m) ``` diff --git a/doc/architecture/blueprints/cloud_native_build_logs/index.md b/doc/architecture/blueprints/cloud_native_build_logs/index.md index d9cd629aa95..0b02da21109 100644 --- a/doc/architecture/blueprints/cloud_native_build_logs/index.md +++ b/doc/architecture/blueprints/cloud_native_build_logs/index.md @@ -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. ✓ Evaluate performance and edge-cases, iterate to improve the new architecture -1. Design cloud native build logs correctness verification mechanisms -1. Build observability mechanisms around performance and correctness +1. ✓ Design cloud native build logs correctness verification mechanisms +1. ✓ Build observability mechanisms around performance and correctness 1. Rollout the feature into production environment incrementally The work needed to make the new architecture production ready and enabled on diff --git a/doc/integration/gitpod.md b/doc/integration/gitpod.md index f26483e3b5e..bd038eaf47b 100644 --- a/doc/integration/gitpod.md +++ b/doc/integration/gitpod.md @@ -72,3 +72,4 @@ To disable it: ```ruby Feature.disable(:gitpod) +``` diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md index e9b07f54b91..8eab1841875 100644 --- a/doc/user/project/service_desk.md +++ b/doc/user/project/service_desk.md @@ -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 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.