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-06-22 21:07:47 +00:00
parent 92e314ffe8
commit 09d9f0d988
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/application_settings/metrics_and_profiling.html.haml
View File

@ -51,6 +51,4 @@
.settings-content
= render 'usage'
= render_if_exists 'admin/application_settings/seat_link_setting', expanded: expanded_by_default?
= render_if_exists 'admin/application_settings/pseudonymizer_settings', expanded: expanded_by_default?

1
config/initializers/1_settings.rb
View File

@ -222,7 +222,6 @@ Gitlab.ee do
Settings.gitlab['mirror_max_delay'] ||= 300
Settings.gitlab['mirror_max_capacity'] ||= 30
Settings.gitlab['mirror_capacity_threshold'] ||= 15
Settings.gitlab['seat_link_enabled'] = true if Settings.gitlab['seat_link_enabled'].nil?
end
#

18
locale/gitlab.pot
View File

@ -11953,9 +11953,6 @@ msgstr ""
msgid "Enable SSL verification"
msgstr ""
msgid "Enable Seat Link"
msgstr ""
msgid "Enable Spam Check via external API endpoint"
msgstr ""
@ -12034,9 +12031,6 @@ msgstr ""
msgid "Enable mirror configuration"
msgstr ""
msgid "Enable or disable Seat Link."
msgstr ""
msgid "Enable or disable the Pseudonymizer data collection."
msgstr ""
@ -14098,9 +14092,6 @@ msgstr ""
msgid "For more information, see the documentation on %{deactivating_usage_ping_link_start}deactivating the usage ping%{deactivating_usage_ping_link_end}."
msgstr ""
msgid "For more information, see the documentation on %{link_start}disabling Seat Link%{link_end}."
msgstr ""
msgid "Forgot your password?"
msgstr ""
@ -28610,12 +28601,6 @@ msgstr[1] ""
msgid "Searching by both author and message is currently not supported."
msgstr ""
msgid "Seat Link"
msgstr ""
msgid "Seat Link is disabled, and cannot be configured through this form."
msgstr ""
msgid "SeatUsage|Seat usage"
msgstr ""
@ -34006,9 +33991,6 @@ msgstr ""
msgid "To set up this service:"
msgstr ""
msgid "To simplify the billing process, GitLab will collect user counts in order to prorate charges for user growth throughout the year using a quarterly reconciliation process."
msgstr ""
msgid "To specify the notification level per project of a group you belong to, you need to visit project page and change notification level there."
msgstr ""