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

Fixed collection upload permissions and css styling #3571

Merged
merged 2 commits into from
Apr 13, 2023

Conversation

jerabekjiri
Copy link
Contributor

Issue: AAH-2276

If the kebab menu is empty, hide it.

Card view:
Screenshot from 2023-04-12 13-45-31
Screenshot from 2023-04-12 13-43-13

List view:
Screenshot from 2023-04-12 13-59-26
Screenshot from 2023-04-12 13-49-51

@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 Apr 12, 2023
@jerabekjiri jerabekjiri removed the backport-4.6 This PR should be backported to stable-4.6 (2.3) label Apr 12, 2023
Issue: AAH-2276
@jerabekjiri jerabekjiri requested review from newswangerd and himdel and removed request for newswangerd April 12, 2023 15:53
@himdel himdel merged commit da2cf18 into ansible:master Apr 13, 2023
@patchback
Copy link

patchback bot commented Apr 13, 2023

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

❌ Failed to cleanly apply da2cf18 on top of patchback/backports/stable-4.7/da2cf1852da925f6d354fd1583ee56df1dcfa0ce/pr-3571

Backporting merged PR #3571 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/da2cf1852da925f6d354fd1583ee56df1dcfa0ce/pr-3571 upstream/stable-4.7
  4. Now, cherry-pick PR Fixed collection upload permissions and css styling #3571 contents into that branch:
    $ git cherry-pick -x da2cf1852da925f6d354fd1583ee56df1dcfa0ce
    If it'll yell at you with something like fatal: Commit da2cf1852da925f6d354fd1583ee56df1dcfa0ce is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x da2cf1852da925f6d354fd1583ee56df1dcfa0ce
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fixed collection upload permissions and css styling #3571 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.7/da2cf1852da925f6d354fd1583ee56df1dcfa0ce/pr-3571
  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.

jerabekjiri added a commit to jerabekjiri/ansible-hub-ui that referenced this pull request Apr 17, 2023
* fixed collection upload permission and css styling

Issue: AAH-2276

* fix tests

Issue: AAH-2276
(cherry picked from commit da2cf18)
jerabekjiri added a commit that referenced this pull request Apr 17, 2023
* fixed collection upload permission and css styling
* fix tests
Issue: AAH-2276
(cherry picked from commit da2cf18)
@github-actions github-actions bot added the backported-4.7 This PR has been backported to stable-4.7 (2.4) label Apr 17, 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