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

retry queued job patch #1423

Merged
merged 1 commit into from Apr 13, 2016
Merged

retry queued job patch #1423

merged 1 commit into from Apr 13, 2016

Conversation

Jngai
Copy link
Contributor

@Jngai Jngai commented Apr 12, 2016

quick rewording

changed glyphicon

skip failed jobs locked at and using update all

spec ready as well

rm without protection modify spec

rm unnecessary lines

work on delayed job feature

fixed render json

switched from ok to success

revert render json change for other methods

checking in work

test passed

reverting render and saving a line of code

add back sign in an user

run this on github

altered format.json

rm comment

prevent ajax error head no content

quick rewording

changed glyphicon

skip failed jobs locked at and using update all

spec ready as well

rm without protection modify spec

rm unnecessary lines

work on delayed job feature

fixed render json

switched from ok to success

revert render json change for other methods

checking in work

test passed

reverting render and saving a line of code

add back sign in an user

run this on github

altered format.json

rm comment

prevent ajax error head no content
@Jngai
Copy link
Contributor Author

Jngai commented Apr 12, 2016

@dsander ok I squashed everything into one.

@dsander
Copy link
Collaborator

dsander commented Apr 12, 2016

Thanks @Jngai, after squashing the commits you could have kept the original pull request by force pushing to the branch of your fork. I will leave the final review & merge to @cantino as he started to review your PR.

@Jngai
Copy link
Contributor Author

Jngai commented Apr 12, 2016

@dsander I am sorry I check my history and did these

289  git rebase -i HEAD~19
290  git push origin :queuedjobpatch --force

and then the original pull request was deleted.... and then I republished the branch, sure lets wait for @cantino to review.

@Jngai Jngai closed this Apr 13, 2016
@Jngai Jngai reopened this Apr 13, 2016
@cantino cantino merged commit 35bbd2a into huginn:master Apr 13, 2016
@cantino
Copy link
Member

cantino commented Apr 13, 2016

Thanks @Jngai!

@dsander
Copy link
Collaborator

dsander commented Apr 13, 2016

👏 @Jngai No worries, I think the problem was the : which deleted the remote branch git push origin queuedjobpatch --force should have worked 😄

@Jngai Jngai deleted the queuedjobpatch branch April 13, 2016 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants