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

Git tag feature #713

Merged
merged 8 commits into from Aug 1, 2020
Merged

Conversation

chrisjohn2306
Copy link
Contributor

@chrisjohn2306 chrisjohn2306 commented Jul 30, 2020

The changes for git tag feature has been added in this PR.
#638 is already existing. But due to some conflict issues the pr has been corrupted. The review comments from that pr has been incorporated here.

The feature discussion is in #588

@chrisjohn2306
Copy link
Contributor Author

@fcollonval and @kgryte . Can you review the changes again and help me to complete this feature

Use SVG icon
Reduce code foot print
Use new Alert component
fcollonval
fcollonval previously approved these changes Aug 1, 2020
Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chrisjohn2306 Thank you for this feature.

I simplified the frontend code to:

  • Use SVG icon
  • Take advantage of the new status bar and alert components instead of using two dialogs.
  • Use more homogeneous signature of model method (i.e. not passing the repo path as argument)

Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok after some fight with the latest notebook version and the unit test. This is good to go.

@fcollonval fcollonval merged commit c1ffae2 into jupyterlab:master Aug 1, 2020
@fcollonval
Copy link
Member

@meeseeksdev backport to 0.11.x

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 1, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 0.11.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 c1ffae2f894fb455cca5c636f2f64c9037784a8c
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #713: Git tag feature'
  1. Push to a named branch :
git push YOURFORK 0.11.x:auto-backport-of-pr-713-on-0.11.x
  1. Create a PR against branch 0.11.x, I would have named this PR:

"Backport PR #713 on branch 0.11.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

fcollonval pushed a commit to fcollonval/jupyterlab-git that referenced this pull request Aug 1, 2020
@fcollonval fcollonval added this to the 0.21.0 milestone Aug 1, 2020
fcollonval added a commit that referenced this pull request Aug 1, 2020
Co-authored-by: Chris John <58581644+chrisjohn2306@users.noreply.github.com>
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

2 participants