Merge branch 'next-minor' into develop

2017-08-19 12:39:42 +02:00 · 2017-08-19 12:39:42 +02:00 · 680894d121
commit 680894d121
parent 9ffbf2f788 951a258a3d
2 changed files with 5 additions and 0 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -9,6 +9,7 @@
 # 0.7.1.0

 ## Refactor
+* Remove title from profile photo upload button [#7551](https://github.com/diaspora/diaspora/pull/7551)

 ## Bug fixes

--- a/app/assets/javascripts/helpers/profile_photo_uploader.js
+++ b/app/assets/javascripts/helpers/profile_photo_uploader.js
@ -78,6 +78,10 @@ Diaspora.ProfilePhotoUploader.prototype = {
            alert(errorReason);
          }
        }
+      },
+
+      text: {
+        fileInputTitle: ""
      }
    });
  }