summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-12-21 17:34:20 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-12-21 17:34:20 +0000
commita08bef4ebf3b87e52a32af7a1c297e0de99fa1a0 (patch)
tree42423bce7910b46894a8f291f0078a4a47b334f3
parentb8d79cc479200ff714f89dc43a3bbec18af3c5b5 (diff)
downloadgitlab-ce-a08bef4ebf3b87e52a32af7a1c297e0de99fa1a0.tar.gz
Update Browse file to Choose file in all occurences
-rw-r--r--app/views/profiles/show.html.haml2
-rw-r--r--app/views/projects/edit.html.haml2
-rw-r--r--changelogs/unreleased/40780-choose-file.yml5
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 79f334176a5..f9dae310e01 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -26,7 +26,7 @@
Upload new avatar
.prepend-top-5.append-bottom-10
%a.btn.js-choose-user-avatar-button
- Browse file...
+ Choose file...
%span.avatar-file-name.prepend-left-default.js-avatar-filename No file chosen
= f.file_field_without_bootstrap :avatar, class: 'js-user-avatar-input hidden', accept: 'image/*'
.help-block
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 71206f3a386..9d0d525a292 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -52,7 +52,7 @@
- if @project.avatar_in_git
Project avatar in repository: #{ @project.avatar_in_git }
%a.choose-btn.btn.js-choose-project-avatar-button
- Browse file...
+ Choose file...
%span.file_name.prepend-left-default.js-avatar-filename No file chosen
= f.file_field :avatar, class: "js-project-avatar-input hidden"
.help-block The maximum file size allowed is 200KB.
diff --git a/changelogs/unreleased/40780-choose-file.yml b/changelogs/unreleased/40780-choose-file.yml
new file mode 100644
index 00000000000..73e59dfcce8
--- /dev/null
+++ b/changelogs/unreleased/40780-choose-file.yml
@@ -0,0 +1,5 @@
+---
+title: Update Browse file to Choose file in all occurences
+merge_request:
+author:
+type: other