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
455ad3b2
Commit
455ad3b2
authored
Sep 15, 2021
by
Jonas Wälter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extend /help/instance_configuration with Git LFS rate limit
Changelog: added
parent
745db9d0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
0 deletions
+13
-0
app/models/instance_configuration.rb
app/models/instance_configuration.rb
+5
-0
app/views/help/instance_configuration/_rate_limits.html.haml
app/views/help/instance_configuration/_rate_limits.html.haml
+1
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/models/instance_configuration_spec.rb
spec/models/instance_configuration_spec.rb
+4
-0
No files found.
app/models/instance_configuration.rb
View file @
455ad3b2
...
@@ -98,6 +98,11 @@ class InstanceConfiguration
...
@@ -98,6 +98,11 @@ class InstanceConfiguration
requests_per_period:
application_settings
[
:throttle_authenticated_packages_api_requests_per_period
],
requests_per_period:
application_settings
[
:throttle_authenticated_packages_api_requests_per_period
],
period_in_seconds:
application_settings
[
:throttle_authenticated_packages_api_period_in_seconds
]
period_in_seconds:
application_settings
[
:throttle_authenticated_packages_api_period_in_seconds
]
},
},
authenticated_git_lfs_api:
{
enabled:
application_settings
[
:throttle_authenticated_git_lfs_enabled
],
requests_per_period:
application_settings
[
:throttle_authenticated_git_lfs_requests_per_period
],
period_in_seconds:
application_settings
[
:throttle_authenticated_git_lfs_period_in_seconds
]
},
issue_creation:
application_setting_limit_per_minute
(
:issues_create_limit
),
issue_creation:
application_setting_limit_per_minute
(
:issues_create_limit
),
note_creation:
application_setting_limit_per_minute
(
:notes_create_limit
),
note_creation:
application_setting_limit_per_minute
(
:notes_create_limit
),
project_export:
application_setting_limit_per_minute
(
:project_export_limit
),
project_export:
application_setting_limit_per_minute
(
:project_export_limit
),
...
...
app/views/help/instance_configuration/_rate_limits.html.haml
View file @
455ad3b2
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Protected Paths: requests'
),
rate_limit:
rate_limits
[
:protected_paths
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Protected Paths: requests'
),
rate_limit:
rate_limits
[
:protected_paths
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Package Registry: unauthenticated API requests'
),
rate_limit:
rate_limits
[
:unauthenticated_packages_api
],
public_visible:
true
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Package Registry: unauthenticated API requests'
),
rate_limit:
rate_limits
[
:unauthenticated_packages_api
],
public_visible:
true
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Package Registry: authenticated API requests'
),
rate_limit:
rate_limits
[
:authenticated_packages_api
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Package Registry: authenticated API requests'
),
rate_limit:
rate_limits
[
:authenticated_packages_api
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Authenticated Git LFS requests'
),
rate_limit:
rate_limits
[
:authenticated_git_lfs_api
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Issue creation requests'
),
rate_limit:
rate_limits
[
:issue_creation
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Issue creation requests'
),
rate_limit:
rate_limits
[
:issue_creation
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Note creation requests'
),
rate_limit:
rate_limits
[
:note_creation
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Note creation requests'
),
rate_limit:
rate_limits
[
:note_creation
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Project export requests'
),
rate_limit:
rate_limits
[
:project_export
]
=
render
'help/instance_configuration/rate_limit_row'
,
title:
_
(
'Project export requests'
),
rate_limit:
rate_limits
[
:project_export
]
...
...
locale/gitlab.pot
View file @
455ad3b2
...
@@ -4780,6 +4780,9 @@ msgstr ""
...
@@ -4780,6 +4780,9 @@ msgstr ""
msgid "Authenticated Git LFS request rate limit"
msgid "Authenticated Git LFS request rate limit"
msgstr ""
msgstr ""
msgid "Authenticated Git LFS requests"
msgstr ""
msgid "Authenticated web rate limit period in seconds"
msgid "Authenticated web rate limit period in seconds"
msgstr ""
msgstr ""
...
...
spec/models/instance_configuration_spec.rb
View file @
455ad3b2
...
@@ -175,6 +175,9 @@ RSpec.describe InstanceConfiguration do
...
@@ -175,6 +175,9 @@ RSpec.describe InstanceConfiguration do
throttle_authenticated_packages_api_enabled:
true
,
throttle_authenticated_packages_api_enabled:
true
,
throttle_authenticated_packages_api_requests_per_period:
1011
,
throttle_authenticated_packages_api_requests_per_period:
1011
,
throttle_authenticated_packages_api_period_in_seconds:
1012
,
throttle_authenticated_packages_api_period_in_seconds:
1012
,
throttle_authenticated_git_lfs_enabled:
true
,
throttle_authenticated_git_lfs_requests_per_period:
1022
,
throttle_authenticated_git_lfs_period_in_seconds:
1023
,
issues_create_limit:
1013
,
issues_create_limit:
1013
,
notes_create_limit:
1014
,
notes_create_limit:
1014
,
project_export_limit:
1015
,
project_export_limit:
1015
,
...
@@ -196,6 +199,7 @@ RSpec.describe InstanceConfiguration do
...
@@ -196,6 +199,7 @@ RSpec.describe InstanceConfiguration do
expect
(
rate_limits
[
:protected_paths
]).
to
eq
({
enabled:
true
,
requests_per_period:
1007
,
period_in_seconds:
1008
})
expect
(
rate_limits
[
:protected_paths
]).
to
eq
({
enabled:
true
,
requests_per_period:
1007
,
period_in_seconds:
1008
})
expect
(
rate_limits
[
:unauthenticated_packages_api
]).
to
eq
({
enabled:
false
,
requests_per_period:
1009
,
period_in_seconds:
1010
})
expect
(
rate_limits
[
:unauthenticated_packages_api
]).
to
eq
({
enabled:
false
,
requests_per_period:
1009
,
period_in_seconds:
1010
})
expect
(
rate_limits
[
:authenticated_packages_api
]).
to
eq
({
enabled:
true
,
requests_per_period:
1011
,
period_in_seconds:
1012
})
expect
(
rate_limits
[
:authenticated_packages_api
]).
to
eq
({
enabled:
true
,
requests_per_period:
1011
,
period_in_seconds:
1012
})
expect
(
rate_limits
[
:authenticated_git_lfs_api
]).
to
eq
({
enabled:
true
,
requests_per_period:
1022
,
period_in_seconds:
1023
})
expect
(
rate_limits
[
:issue_creation
]).
to
eq
({
enabled:
true
,
requests_per_period:
1013
,
period_in_seconds:
60
})
expect
(
rate_limits
[
:issue_creation
]).
to
eq
({
enabled:
true
,
requests_per_period:
1013
,
period_in_seconds:
60
})
expect
(
rate_limits
[
:note_creation
]).
to
eq
({
enabled:
true
,
requests_per_period:
1014
,
period_in_seconds:
60
})
expect
(
rate_limits
[
:note_creation
]).
to
eq
({
enabled:
true
,
requests_per_period:
1014
,
period_in_seconds:
60
})
expect
(
rate_limits
[
:project_export
]).
to
eq
({
enabled:
true
,
requests_per_period:
1015
,
period_in_seconds:
60
})
expect
(
rate_limits
[
:project_export
]).
to
eq
({
enabled:
true
,
requests_per_period:
1015
,
period_in_seconds:
60
})
...
...
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