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 2021-04-25 18:09:52 +00:00
parent 1d93505d16
commit 5220d8d2d6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/security/reset_user_password.md
View File

@ -20,8 +20,8 @@ which can be invoked by the following command:
sudo gitlab-rake "gitlab:password:reset"
```
You will be asked for username, password, and password confirmation. Upon giving
proper values for them, the password of the specified user will be updated.
GitLab asks for a username, a password, and a password confirmation. Upon giving
proper values for them, the password of the specified user is updated.
The Rake task also takes the username as an argument, as shown in the example
below:
@ -91,7 +91,7 @@ Try fixing this on the rails console. For example, if your new `root` password i
1. [Start a Rails console](../administration/operations/rails_console.md).
1. Find the user and skip reconfirmation. Any of the methods to find the user, above, will work:
1. Find the user and skip reconfirmation, using any of the methods above:
```ruby
user = User.find(1)
@ -110,7 +110,7 @@ password.
If the username was changed to something else and has been forgotten, one
possible way is to reset the password using Rails console with user ID `1` (in
almost all the cases, the first user will be the default admin account).
almost all the cases, the first user is the default admin account).
<!-- ## Troubleshooting

6
doc/user/project/import/manifest.md
View File

@ -29,7 +29,7 @@ A manifest must be an XML file. There must be one `remote` tag with a `review`
attribute that contains a URL to a Git server, and each `project` tag must have
a `name` and `path` attribute. GitLab will then build the URL to the repository
by combining the URL from the `remote` tag with a project name.
A path attribute will be used to represent the project path in GitLab.
A path attribute is used to represent the project path in GitLab.
Below is a valid example of a manifest file:
@ -42,7 +42,7 @@ Below is a valid example of a manifest file:
</manifest>
```
As a result, the following projects will be created:
As a result, the following projects are created:
| GitLab | Import URL |
|:------------------------------------------------|:------------------------------------------------------------|
@ -58,7 +58,7 @@ You can start the import with:
1. Click on the **Manifest file** button
1. Provide GitLab with a manifest XML file
1. Select a group you want to import to (you need to create a group first if you don't have one)
1. Click **List available repositories**. At this point, you will be redirected
1. Click **List available repositories**. At this point, you are redirected
to the import status page with projects list based on the manifest file.
1. Check the list and click **Import all repositories** to start the import.