search

EatWithMeApp / eatwithme

3 stars 6 forks source link

Add unblock list to Settings and make Settings page #87

Closed MufasaTheMusician closed 5 years ago

MufasaTheMusician commented 5 years ago

On the Settings page (which needs to be made as part of this ticket), there needs to be a list of users that have been blocked by logged in user (have blocked list property) and a way to unblock those users

MufasaTheMusician commented 5 years ago

Thanks @Joel-Groves, please make sure to make and link a pull request so we can push this through and finish :)

MufasaTheMusician commented 5 years ago

Thanks @Joel-Groves :) I think you might need to have a look at how your remote git links are set up because the push went straight into my repo, which made it a huge commit of all the previous merges plus your changes, whereas a pull request would just push your changes on and make commits cleaner and easier to manage. If anything happened to break as part of your merge it would break the development build and we'd have to roll back.

I know we were talking about your pull request having issues earlier, I think it might be because you did your work directly in the development branch instead of a separate one, so maybe it got confused about a pull request to itself and didn't do it properly. I usually do a git checkout from development with the name like issue-87, commit and push changes to my remote repo, then submit a pull request using that branch.

I'll review this change when I get a chance and close once I confirm it's all good (fairly sure it will be since it's UI changes, but just to be sure haha)