Merge branch...

Merge branch '33489-rename-settings-panel-close-action-to-collapse-to-avoid-confusion-ee' into 'master'

Port Resolve "Rename settings panel "close" action to "collapse" to avoid confusion" to EE

See merge request !2096

app/views/projects/deploy_keys/_index.html.haml

@@ -4,7 +4,7 @@
     %h4
       Deploy Keys
     %button.btn.js-settings-toggle
-      = expanded ? 'Close' : 'Expand'
+      = expanded ? 'Collapse' : 'Expand'
     %p
       Deploy keys allow read-only or read-write (if enabled) access to your repository. Deploy keys can be used for CI, staging or production servers. You can create a deploy key or add an existing one.
   .settings-content.no-animate{ class: ('expanded' if expanded) }

app/views/projects/mirrors/_show.html.haml

@@ -4,7 +4,7 @@
     %h4
       Pull from a remote repository
     %button.btn.js-settings-toggle
-      = expanded ? 'Close' : 'Expand'
+      = expanded ? 'Collapse' : 'Expand'
     %p
       Set up your project to automatically have its branches, tags, and commits
       updated from an upstream repository every hour.
@@ -53,7 +53,7 @@
     %h4
       Push to a remote repository
     %button.btn.js-settings-toggle
-      = expanded ? 'Close' : 'Expand'
+      = expanded ? 'Collapse' : 'Expand'
     %p
       Set up the remote repository that you want to update with the content of the current repository
       every time someone pushes to it.

app/views/projects/protected_branches/_index.html.haml

@@ -7,7 +7,7 @@
     %h4
       Protected Branches
     %button.btn.js-settings-toggle
-      = expanded ? 'Close' : 'Expand'
+      = expanded ? 'Collapse' : 'Expand'
     %p
       Keep stable branches secure and force developers to use merge requests.
   .settings-content.no-animate{ class: ('expanded' if expanded) }

app/views/projects/protected_tags/_index.html.haml

@@ -7,7 +7,7 @@
     %h4
       Protected Tags
     %button.btn.js-settings-toggle
-      = expanded ? 'Close' : 'Expand'
+      = expanded ? 'Collapse' : 'Expand'
     %p
       Limit access to creating and updating tags.
   .settings-content.no-animate{ class: ('expanded' if expanded) }

app/views/projects/push_rules/_index.html.haml

@@ -4,7 +4,7 @@
     %h4
       Push Rules
     %button.btn.js-settings-toggle
-      = expanded ? 'Close' : 'Expand'
+      = expanded ? 'Collapse' : 'Expand'
     %p
       Push Rules outline what is accepted for this project.
   .settings-content.no-animate{ class: ('expanded' if expanded) }