summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Amirault <mamirault@gitlab.com>2019-09-05 13:02:25 +0900
committerMarcel Amirault <mamirault@gitlab.com>2019-09-05 13:02:25 +0900
commitf4986d739a73700414b3fb639760cecb5d02664c (patch)
tree5ceadb52305200cf21da2344733e8c4d8cde0aa8
parent531cec994db2cfbbe638931f9548e968e6d6c3ec (diff)
downloadgitlab-ce-docs-debug-harishsr.tar.gz
Rephrase import repository naming sectiondocs-debug-harishsr
-rw-r--r--doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md13
-rw-r--r--doc/administration/troubleshooting/linux_cheat_sheet.md2
-rw-r--r--doc/administration/troubleshooting/test_environments.md2
3 files changed, 9 insertions, 8 deletions
diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
index bfa2793b0f2..0c5611aa6cd 100644
--- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
+++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
@@ -261,7 +261,6 @@ end
## Imports / Exports
```ruby
-Fail an import
# Find the project and get the error
p = Project.find_by_full_path('<username-or-group>/<project-name>')
@@ -276,11 +275,13 @@ p.import_state.mark_as_failed("Failed manually through console.")
### Rename imported repository
-A customer had a backup restore that failed on a single repository. It created the
-project with an empty repository. They were able to successfully restore it to a dev
-instance. From there, they created an export and imported it into a new project. They
-did not want the project under the new name. We were able to transfer the newly imported
-project to the empty project.
+In a specific situation, an imported repository needed to be renamed. The Support
+Team was informed of a backup restore that failed on a single repository, which created
+the project with an empty repository. The project was successfully restored to a dev
+instance, then exported, and imported into a new project under a different name.
+
+The Support Team was able to transfer the incorrectly named imported project into the
+correctly named empty project using the steps below.
Move the new repository to the empty repository:
diff --git a/doc/administration/troubleshooting/linux_cheat_sheet.md b/doc/administration/troubleshooting/linux_cheat_sheet.md
index 2c9f9ed6c5b..2bbb498f020 100644
--- a/doc/administration/troubleshooting/linux_cheat_sheet.md
+++ b/doc/administration/troubleshooting/linux_cheat_sheet.md
@@ -192,7 +192,7 @@ but provides much more detailed statistics.
MacOS and Linux binaries [are available](https://gitlab.com/gitlab-com/support/toolbox/strace-parser/-/tags),
or you can build it from source if you have the Rust compiler.
-#### How to use the tool:
+#### How to use the tool
First run the tool with no arguments other than the strace output file name to get
a summary of the top processes sorted by time spent actively performing tasks. You
diff --git a/doc/administration/troubleshooting/test_environments.md b/doc/administration/troubleshooting/test_environments.md
index a1df4e1150d..075effc5dc3 100644
--- a/doc/administration/troubleshooting/test_environments.md
+++ b/doc/administration/troubleshooting/test_environments.md
@@ -105,7 +105,7 @@ ElasticSearch's default username is `elastic` and password is `changeme`.
### PlantUML
-See [our PlantUML docs](https://docs.gitlab.com/ee/administration/integration/plantuml.html#docker)
+See [our PlantUML docs](../integration/plantuml.md#docker)
on running PlantUML in Docker.
### Jira