Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5690 update stream on reshare #5699

Merged

Conversation

@WebDevFromScratch
Copy link
Contributor

commented Feb 23, 2015

This is supposed to fix issue #5690.

While the immediate adding new reshares to the stream now works, the re-shares count is not updated for this newly reshared post. I tried to fix that, but unsuccessfully. I think app.views.Reshare in content_view.js is responsible for doing this, but I couldn't make it work.

},
error: function(){
interactions.reshares.add(reshare);
if( app.stream ) app.stream.addNow(reshare);

This comment has been minimized.

Copy link
@houndci-bot

houndci-bot Feb 23, 2015

Expected '{' and instead saw 'app'.

@jhass

This comment has been minimized.

Copy link
Member

commented Feb 23, 2015

Looking good to me, if you could just fix the style issue and rebase into a clean commit using git rebase -i to squash them?

@WebDevFromScratch WebDevFromScratch force-pushed the WebDevFromScratch:5690-update-stream-on-reshare branch from 5af4cc1 to 9429596 Feb 23, 2015

},
error: function(){
interactions.reshares.add(reshare);
if (app.stream) {app.stream.addNow(reshare)};

This comment has been minimized.

Copy link
@houndci-bot

houndci-bot Feb 23, 2015

Unnecessary semicolon.

This comment has been minimized.

Copy link
@WebDevFromScratch

WebDevFromScratch Feb 23, 2015

Author Contributor

From one error to another, meh... @jhass Could you tell me if squashed the commits now? I thought I did this before, but apparently I must have been doing something wrong..

This comment has been minimized.

Copy link
@jhass

jhass Feb 23, 2015

Member

No you didn't. git rebase -i upstream/develop should open an editor where you can choose pick, squash, fix and so on. You keep the first commit at pick and choose squash for the others.

This comment has been minimized.

Copy link
@WebDevFromScratch

WebDevFromScratch Feb 23, 2015

Author Contributor

Oh, okay, now I remember that I was having some problems with atom editor and those editing rebase before... I will fix this.

This comment has been minimized.

Copy link
@jhass

jhass Feb 23, 2015

Member

Cool, tip for the future: You can edit a commit with git commit --amend, which is fine to do as long as you're in feature branch.

@WebDevFromScratch WebDevFromScratch force-pushed the WebDevFromScratch:5690-update-stream-on-reshare branch from c83948b to b8be76b Feb 23, 2015

changed reshare function, so it adds the object to the stream
tests for reshares

Changelog.md update

fixing a style issue

removed unnecessary semicolon

@jhass jhass added this to the next-major milestone Feb 23, 2015

@jhass

This comment has been minimized.

Copy link
Member

commented Feb 23, 2015

Thank you!

@jhass jhass merged commit b8be76b into diaspora:develop Feb 23, 2015

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
hound Hound has reviewed the changes.

jhass added a commit that referenced this pull request Feb 23, 2015

Merge pull request #5699 from WebDevFromScratch/5690-update-stream-on…
…-reshare

5690 update stream on reshare
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.