Automatic merge of gitlab-org/gitlab-ce master

app/views/projects/update.js.haml

@@ -4,7 +4,7 @@
     location.reload();
 - else
   :plain
-    $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
+    $(".flash-container").html("#{escape_javascript(render('errors'))}");
     $('.save-project-loader').hide();
     $('.project-edit-container').show();
     $('.edit-project .js-btn-success-general-project-settings').enable();

changelogs/unreleased/34414-update-personal-access-token-scope-descriptions-to-reflect-registry-permissions.yml

+---
+title: Updated the personal access token api scope description to reflect the permissions
+  it grants
+merge_request: 31759
+author:
+type: other

changelogs/unreleased/issue-61873-no-error-message-for-general-settings.yml

+---
+title: error message for general settings
+merge_request: 31636
+author: Mesut Güneş
+type: fixed

config/locales/doorkeeper.en.yml

@@ -69,7 +69,7 @@ en:
       email: Allows read-only access to the user's primary email address using OpenID Connect
     scope_desc:
       api:
-        Grants complete read/write access to the API, including all groups and projects.
+        Grants complete read/write access to the API, including all groups and projects, the container registry, and the package registry.
       read_user:
         Grants read-only access to the authenticated user's profile through the /user API endpoint, which includes username, public email, and full name. Also grants access to read-only API endpoints under /users.
       read_repository:

doc/user/profile/personal_access_tokens.md

@@ -44,7 +44,7 @@ the following table.
 | Scope              | Introduced in | Description |
 | ------------------ | ------------- | ----------- |
 | `read_user`        | [GitLab 8.15](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5951)   | Allows access to the read-only endpoints under `/users`. Essentially, any of the `GET` requests in the [Users API][users] are allowed. |
-| `api`              | [GitLab 8.15](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5951)   | Grants complete access to the API and Container Registry (read/write). |
+| `api`              | [GitLab 8.15](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5951)   | Grants complete read/write access to the API, including all groups and projects, the container registry, and the package registry. |
 | `read_registry`    | [GitLab 9.3](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11845)   | Allows to read (pull) [container registry] images if a project is private and authorization is required. |
 | `sudo`             | [GitLab 10.2](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14838)  | Allows performing API actions as any user in the system (if the authenticated user is an admin). |
 | `read_repository`  | [GitLab 10.7](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17894)  | Allows read-only access (pull) to the repository through git clone. |