Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
22bf2189
Commit
22bf2189
authored
Jun 16, 2021
by
Marcin Sedlak-Jakubowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Plan pages with 14.0 Admin Area access info
parent
2f9eec2f
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
13 deletions
+31
-13
doc/user/admin_area/settings/email.md
doc/user/admin_area/settings/email.md
+6
-4
doc/user/admin_area/settings/img/file_template_admin_area.png
...user/admin_area/settings/img/file_template_admin_area.png
+0
-0
doc/user/admin_area/settings/img/file_template_admin_area_v14_0.png
...dmin_area/settings/img/file_template_admin_area_v14_0.png
+0
-0
doc/user/admin_area/settings/rate_limit_on_issues_creation.md
...user/admin_area/settings/rate_limit_on_issues_creation.md
+7
-1
doc/user/admin_area/settings/rate_limit_on_notes_creation.md
doc/user/admin_area/settings/rate_limit_on_notes_creation.md
+5
-3
doc/user/project/description_templates.md
doc/user/project/description_templates.md
+4
-3
doc/user/project/time_tracking.md
doc/user/project/time_tracking.md
+9
-2
No files found.
doc/user/admin_area/settings/email.md
View file @
22bf2189
...
@@ -20,8 +20,9 @@ The logo in the header of some emails can be customized, see the [logo customiza
...
@@ -20,8 +20,9 @@ The logo in the header of some emails can be customized, see the [logo customiza
The additional text appears at the bottom of any email and can be used for
The additional text appears at the bottom of any email and can be used for
legal/auditing/compliance reasons.
legal/auditing/compliance reasons.
1.
Go to
**Admin Area > Settings > Preferences**
(
`/admin/application_settings/preferences`
).
1.
On the top bar, select
**Menu >**
**{admin}**
**Admin**
.
1.
Expand the
**Email**
section.
1.
On the left sidebar, select
**Settings > Preferences**
(
`/admin/application_settings/preferences`
).
1.
Expand
**Email**
.
1.
Enter your text in the
**Additional text**
field.
1.
Enter your text in the
**Additional text**
field.
1.
Click
**Save**
.
1.
Click
**Save**
.
...
@@ -34,8 +35,9 @@ This configuration option sets the email hostname for [private commit emails](..
...
@@ -34,8 +35,9 @@ This configuration option sets the email hostname for [private commit emails](..
In order to change this option:
In order to change this option:
1.
Go to
**Admin Area > Settings > Preferences**
(
`/admin/application_settings/preferences`
).
1.
On the top bar, select
**Menu >**
**{admin}**
**Admin**
.
1.
Expand the
**Email**
section.
1.
On the left sidebar, select
**Settings > Preferences**
(
`/admin/application_settings/preferences`
).
1.
Expand
**Email**
.
1.
Enter the desired hostname in the
**Custom hostname (for private commit emails)**
field.
1.
Enter the desired hostname in the
**Custom hostname (for private commit emails)**
field.
1.
Select
**Save changes**
.
1.
Select
**Save changes**
.
...
...
doc/user/admin_area/settings/img/file_template_admin_area.png
deleted
100644 → 0
View file @
2f9eec2f
5.49 KB
doc/user/admin_area/settings/img/file_template_admin_area_v14_0.png
0 → 100644
View file @
22bf2189
11 KB
doc/user/admin_area/settings/rate_limit_on_issues_creation.md
View file @
22bf2189
...
@@ -10,7 +10,13 @@ info: To determine the technical writer assigned to the Stage/Group associated w
...
@@ -10,7 +10,13 @@ info: To determine the technical writer assigned to the Stage/Group associated w
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28129) in GitLab 12.10.
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28129) in GitLab 12.10.
This setting allows you to rate limit the requests to the issue creation endpoint.
This setting allows you to rate limit the requests to the issue creation endpoint.
You can change its value in
**Admin Area > Settings > Network > Issues Rate Limits**
.
To can change its value:
1.
On the top bar, select
**Menu >**
**{admin}**
**Admin**
.
1.
On the left sidebar, select
**Settings > Network**
.
1.
Expand
**Issues Rate Limits**
.
1.
Under
**Max requests per minute per user**
, enter the new value.
1.
Select
**Save changes**
.
For example, if you set a limit of 300, requests using the
For example, if you set a limit of 300, requests using the
[
Projects::IssuesController#create
](
https://gitlab.com/gitlab-org/gitlab/raw/master/app/controllers/projects/issues_controller.rb
)
[
Projects::IssuesController#create
](
https://gitlab.com/gitlab-org/gitlab/raw/master/app/controllers/projects/issues_controller.rb
)
...
...
doc/user/admin_area/settings/rate_limit_on_notes_creation.md
View file @
22bf2189
...
@@ -13,9 +13,11 @@ This setting allows you to rate limit the requests to the note creation endpoint
...
@@ -13,9 +13,11 @@ This setting allows you to rate limit the requests to the note creation endpoint
To change the note creation rate limit:
To change the note creation rate limit:
1.
Go to
**Admin Area > Settings > Network**
.
1.
On the top bar, select
**Menu >**
**{admin}**
**Admin**
.
1.
Expand the
**Notes Rate Limits**
section.
1.
On the left sidebar, select
**Settings > Network**
.
1.
Enter the new value.
1.
Expand
**Notes Rate Limits**
.
1.
Under
**Max requests per minute per user**
, enter the new value.
1.
Optional. Under
**List of users to be excluded from the limit**
, list users to be excluded fromt the limit.
1.
Select
**Save changes**
.
1.
Select
**Save changes**
.
This limit is:
This limit is:
...
...
doc/user/project/description_templates.md
View file @
22bf2189
...
@@ -116,12 +116,13 @@ Only instance administrators can set instance-level templates.
...
@@ -116,12 +116,13 @@ Only instance administrators can set instance-level templates.
To set the instance-level description template repository:
To set the instance-level description template repository:
1.
Select the
**Admin Area**
icon (
**{admin}**
).
1.
On the top bar, select
**Menu >**
**{admin}**
**Admin**
.
1.
Go to
**Settings > Templates**
.
1.
On the left sidebar, select
**Settings > Templates**
.
1.
Expand
**Templates**
1.
From the dropdown, select your template project as the template repository at instance level.
1.
From the dropdown, select your template project as the template repository at instance level.
1.
Select
**Save changes**
.
1.
Select
**Save changes**
.
![
Setting templates in the Admin Area
](
../admin_area/settings/img/file_template_admin_area.png
)
![
Setting templates in the Admin Area
](
../admin_area/settings/img/file_template_admin_area
_v14_0
.png
)
Learn more about
[
instance template repository
](
../admin_area/settings/instance_template_repository.md
)
.
Learn more about
[
instance template repository
](
../admin_area/settings/instance_template_repository.md
)
.
...
...
doc/user/project/time_tracking.md
View file @
22bf2189
...
@@ -109,8 +109,15 @@ Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h.
...
@@ -109,8 +109,15 @@ Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29469/) in GitLab 12.1.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/29469/) in GitLab 12.1.
In GitLab self-managed instances, the display of time units can be limited to
In GitLab self-managed instances, you can limit the display of time units to
hours through the option in
**Admin Area > Settings > Preferences**
under
**Localization**
.
hours.
To do so:
1.
On the top bar, select
**Menu >**
**{admin}**
**Admin**
.
1.
On the left sidebar, select
**Settings > Preferences**
.
1.
Expand
**Localization**
.
1.
Under
**Time tracking**
, select the
**Limit display of time tracking units to hours**
checkbox.
1.
Select
**Save changes**
.
With this option enabled,
`75h`
is displayed instead of
`1w 4d 3h`
.
With this option enabled,
`75h`
is displayed instead of
`1w 4d 3h`
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment