pop-os / gnome-control-center

Pop!_OS fork of https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-control-center
GNU General Public License v2.0
29 stars 10 forks source link

Rename 'search' to 'activate-launcher', matching change in pop shell, fixing #93 #99

Closed ids1024 closed 4 years ago

ids1024 commented 4 years ago

Depends on https://github.com/pop-os/shell/pull/436. Fixes #93.

leviport commented 4 years ago

Note: since https://github.com/pop-os/shell/pull/436 is merging into dev, make sure this does not get merged until dev is merged.

ids1024 commented 4 years ago

Note: since pop-os/shell#436 is merging into dev, make sure this does not get merged until dev is merged.

I originally filed both PRs against master. @mmstick changed the base branch for that PR, but not this one.

@mmstick Was that intentional, for some reason I can't think of, or did you mean to change both?

ids1024 commented 4 years ago

Okay, I guess I see. Pop-shell is being developed on dev with regular rollup merges into master.

leviport commented 4 years ago

I would be okay with exempting these two PRs from the dev branch process, but I will defer to engineering about whether or not that's a good idea.

Edit: Looks like https://github.com/pop-os/shell/pull/436 was already merged into dev. That's alright, we can just make a note to merge this when we merge dev.

mmstick commented 4 years ago

I merged dev, so we can merge this if QA is okay with it

leviport commented 4 years ago

dev with https://github.com/pop-os/shell/pull/436 was already merged? That PR was merged into dev less than 10 minutes ago.

As soon as https://github.com/pop-os/shell/pull/436 is in master, I'm okay with merging this.