Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk

2020-11-25 16:43:09 -06:00
parent b4e370d3d3 a9387c5167
commit 20d4fc09af
11 changed files with 66 additions and 30 deletions
--- a/app/javascript/gabsocial/reducers/user.js
+++ b/app/javascript/gabsocial/reducers/user.js
@@ -19,6 +19,7 @@ export default function (state = initialState, action) {
    case SAVE_USER_PROFILE_INFORMATION_FETCH_SUCCESS:
      return state
    case SAVE_USER_PROFILE_INFORMATION_FETCH_FAIL:
+      alert('Failed to update your profile. Max profile image size is 2MB. Please update and try again.')
      return state.set('isError', true)
    case RESEND_USER_CONFIRMATION_EMAIL_SUCCESS:
      return state.set('emailConfirmationResends', state.get('emailConfirmationResends') + 1)