Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 5 deletions

diff --git a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue
index 197a0706062..4fa18b19556 100644
--- a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue
+++ b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue
@@ -41,7 +41,7 @@ export default {
     noForkText() {
       return sprintf(
         __(
-          "To protect this issue's confidentiality, %{link_start}fork the project%{link_end} and set the forks visiblity to private.",
+          "To protect this issue's confidentiality, %{link_start}fork the project%{link_end} and set the forks visibility to private.",
         ),
         { link_start: `<a href="${this.newForkPath}" class="help-link">`, link_end: '</a>' },
         false,
diff --git a/app/finders/admin/projects_finder.rb b/app/finders/admin/projects_finder.rb
index e2b9b0b44c1..53dbf65c43a 100644
--- a/app/finders/admin/projects_finder.rb
+++ b/app/finders/admin/projects_finder.rb
@@ -12,7 +12,7 @@ class Admin::ProjectsFinder
   def execute
     items = Project.without_deleted.with_statistics.with_route
     items = by_namespace_id(items)
-    items = by_visibilty_level(items)
+    items = by_visibility_level(items)
     items = by_with_push(items)
     items = by_abandoned(items)
     items = by_last_repository_check_failed(items)
@@ -31,7 +31,7 @@ class Admin::ProjectsFinder
   end
 
   # rubocop: disable CodeReuse/ActiveRecord
-  def by_visibilty_level(items)
+  def by_visibility_level(items)
     params[:visibility_level].present? ? items.where(visibility_level: params[:visibility_level]) : items
   end
   # rubocop: enable CodeReuse/ActiveRecord
diff --git a/app/helpers/visibility_level_helper.rb b/app/helpers/visibility_level_helper.rb
index 2bd803c0177..a36de5dc548 100644
--- a/app/helpers/visibility_level_helper.rb
+++ b/app/helpers/visibility_level_helper.rb
@@ -201,9 +201,9 @@ module VisibilityLevelHelper
 
   def visibility_level_errors_for_group(group, level_name)
     group_name = link_to group.name, group_path(group)
-    change_visiblity = link_to 'change the visibility', edit_group_path(group)
+    change_visibility = link_to 'change the visibility', edit_group_path(group)
 
     { reason: "the visibility of #{group_name} is #{group.visibility}",
-      instruction: " To make this group #{level_name}, you must first #{change_visiblity} of the parent group." }
+      instruction: " To make this group #{level_name}, you must first #{change_visibility} of the parent group." }
   end
 end