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

Add merge buttons to the show pages for mergeable objects #4856

Merged
merged 3 commits into from
Jul 18, 2024

Conversation

gjvoosten
Copy link
Collaborator

@gjvoosten gjvoosten commented Jul 4, 2024

Details pages for mergeable objects now show a button for an admin to directly go to the merge page for that object.

Closes AB#1163

User changes

  • None.

Superuser changes

  • None.

Admin changes

  • An admin can now click a button at the top of the page for an organization, position, person or location, to go directly to the merge page for that object.

System admin changes

  • anet.yml or anet-dictionary.yml needs change
  • db needs migration
  • documentation has changed
  • graphql schema has changed

Checklist

  • Described the user behavior in PR body
  • Referenced/updated all related issues
  • commits follow a repo#issue: Title title format and these 7 rules
  • commits have a clean history, otherwise PR may be squash-merged
  • Added and/or updated unit tests
  • Added and/or updated e2e tests
  • Added and/or updated data migrations
  • Updated documentation
  • Resolved all build errors and warnings
  • Opened debt issues for anything not resolved here

@gjvoosten gjvoosten force-pushed the AB-1163-add-merge-buttons-to-show-pages branch from 577a93b to 5350d84 Compare July 8, 2024 07:31
@gjvoosten gjvoosten force-pushed the AB-1010-be-able-to-merge-organizations branch from 61d035a to 6a61a88 Compare July 8, 2024 07:59
@gjvoosten gjvoosten force-pushed the AB-1163-add-merge-buttons-to-show-pages branch from 5350d84 to 7b9d1a3 Compare July 8, 2024 08:00
@Chessray Chessray force-pushed the AB-1163-add-merge-buttons-to-show-pages branch from 97260e9 to 96f6e06 Compare July 8, 2024 20:46
Base automatically changed from AB-1010-be-able-to-merge-organizations to main July 9, 2024 08:47
@Chessray Chessray force-pushed the AB-1163-add-merge-buttons-to-show-pages branch 8 times, most recently from 3218bec to 29ef625 Compare July 9, 2024 17:11
@gjvoosten gjvoosten force-pushed the AB-1163-add-merge-buttons-to-show-pages branch from 29ef625 to 7c1e294 Compare July 10, 2024 06:36
@Chessray Chessray force-pushed the AB-1163-add-merge-buttons-to-show-pages branch 2 times, most recently from 0670add to 1b34f3f Compare July 10, 2024 07:09
@gjvoosten gjvoosten marked this pull request as ready for review July 10, 2024 07:43
@gjvoosten gjvoosten force-pushed the AB-1163-add-merge-buttons-to-show-pages branch from 1b34f3f to a96af64 Compare July 10, 2024 10:36
@gjvoosten gjvoosten force-pushed the AB-1163-add-merge-buttons-to-show-pages branch from a96af64 to 701e7a6 Compare July 11, 2024 11:56
Copy link
Contributor

@midmarch midmarch left a comment

Choose a reason for hiding this comment

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

image

image

image

image

Awesome !

@gjvoosten gjvoosten merged commit 1579df2 into main Jul 18, 2024
21 checks passed
@gjvoosten gjvoosten deleted the AB-1163-add-merge-buttons-to-show-pages branch July 18, 2024 06:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants