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

Copy collection version in collection detail screen #3735

Merged

Conversation

jerabekjiri
Copy link
Contributor

@jerabekjiri jerabekjiri commented May 16, 2023

Issue: AAH-2255

Screenshot from 2023-05-16 17-43-47
Screenshot from 2023-05-16 17-45-25

@github-actions github-actions bot added backport-4.6 This PR should be backported to stable-4.6 (2.3) backport-4.7 This PR should be backported to stable-4.7 (2.4) labels May 16, 2023
@jerabekjiri jerabekjiri removed the backport-4.6 This PR should be backported to stable-4.6 (2.3) label May 16, 2023
@jerabekjiri jerabekjiri force-pushed the feature/cv-detail-copy-to-repository branch from 1fbc256 to bf9085b Compare May 16, 2023 22:50
@jerabekjiri jerabekjiri force-pushed the feature/cv-detail-copy-to-repository branch from 2b3fdf4 to d389a25 Compare June 2, 2023 15:39
@jerabekjiri jerabekjiri requested a review from himdel June 5, 2023 13:29
Copy link
Collaborator

@himdel himdel left a comment

Choose a reason for hiding this comment

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

Works for me :)

@jerabekjiri jerabekjiri force-pushed the feature/cv-detail-copy-to-repository branch from 5999f4e to 1b09cb1 Compare June 7, 2023 14:43
@jerabekjiri jerabekjiri force-pushed the feature/cv-detail-copy-to-repository branch from 1b09cb1 to cd940dc Compare June 7, 2023 14:49
@jerabekjiri jerabekjiri merged commit 3c4e894 into ansible:master Jun 7, 2023
@patchback
Copy link

patchback bot commented Jun 7, 2023

Backport to stable-4.7: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 3c4e894 on top of patchback/backports/stable-4.7/3c4e894e5020d30b9e714296a4d3426855048a01/pr-3735

Backporting merged PR #3735 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/ansible-hub-ui.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4.7/3c4e894e5020d30b9e714296a4d3426855048a01/pr-3735 upstream/stable-4.7
  4. Now, cherry-pick PR Copy collection version in collection detail screen #3735 contents into that branch:
    $ git cherry-pick -x 3c4e894e5020d30b9e714296a4d3426855048a01
    If it'll yell at you with something like fatal: Commit 3c4e894e5020d30b9e714296a4d3426855048a01 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 3c4e894e5020d30b9e714296a4d3426855048a01
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Copy collection version in collection detail screen #3735 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.7/3c4e894e5020d30b9e714296a4d3426855048a01/pr-3735
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@himdel himdel added backport-4.7 This PR should be backported to stable-4.7 (2.4) and removed backport-4.7 This PR should be backported to stable-4.7 (2.4) labels Jun 7, 2023
@patchback
Copy link

patchback bot commented Jun 7, 2023

Backport to stable-4.7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4.7/3c4e894e5020d30b9e714296a4d3426855048a01/pr-3735

Backported as #3842

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Jun 7, 2023
* add copy modal in collection detail screen
* add test
* add signing service error check
* fix cypress test
* fix after rebase
AAH-2255

(cherry picked from commit 3c4e894)
himdel pushed a commit that referenced this pull request Jun 8, 2023
…ollection detail screen (#3842)

* Copy collection version in collection detail screen (#3735)

* add copy modal in collection detail screen
* add test
* add signing service error check
* fix cypress test
* fix after rebase
AAH-2255

(cherry picked from commit 3c4e894)

* display_repositories=true

Issue: AAH-2255

---------

Co-authored-by: Jiří Jeřábek (Jiri Jerabek) <Jerabekjirka@email.cz>
@himdel himdel added the backported-4.7 This PR has been backported to stable-4.7 (2.4) label Jun 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.7 This PR should be backported to stable-4.7 (2.4) backported-4.7 This PR has been backported to stable-4.7 (2.4)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants