From f713889e5e5d0657787cf8abd58a368a97042146 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 5 Oct 2021 11:34:50 +0100 Subject: [PATCH 01/14] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Adds=20action=20t?= =?UTF-8?q?o=20detect=20and=20label=20PR=20conflitcts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/check-merge-conflicts.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/check-merge-conflicts.yml diff --git a/.github/workflows/check-merge-conflicts.yml b/.github/workflows/check-merge-conflicts.yml new file mode 100644 index 00000000..b193d8ce --- /dev/null +++ b/.github/workflows/check-merge-conflicts.yml @@ -0,0 +1,16 @@ +# Detect and label pull requests that have merge conflicts +name: 🏗️ Check Merge Conflicts +on: + push: + branches: + - master +jobs: + check-conflicts: + runs-on: ubuntu-latest + steps: + - uses: mschilde/auto-label-merge-conflicts@master + with: + CONFLICT_LABEL_NAME: "🚫 Merge Conflicts" + GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} + MAX_RETRIES: 5 + WAIT_MS: 5000 From be252e2051e14925289b3b6489c3961e55af9c03 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 5 Oct 2021 18:30:43 +0100 Subject: [PATCH 02/14] :octocat: Adds labels to be applied to done issues --- .github/close-label.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/close-label.yml diff --git a/.github/close-label.yml b/.github/close-label.yml new file mode 100644 index 00000000..c354451b --- /dev/null +++ b/.github/close-label.yml @@ -0,0 +1,3 @@ +🐛 Bug: ✅ Fixed +🦄 Feature Request: ✅ Implemented +🤷‍♂️ Question: ✅ Answered From 4117586b91c394793417d2da4790e6e95fd0aa0b Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 5 Oct 2021 18:32:02 +0100 Subject: [PATCH 03/14] =?UTF-8?q?=F0=9F=91=B7=20Apply=20done=20label=20to?= =?UTF-8?q?=20issues=20on=20PR=20close?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/apply-done-label.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/apply-done-label.yml diff --git a/.github/workflows/apply-done-label.yml b/.github/workflows/apply-done-label.yml new file mode 100644 index 00000000..923104c4 --- /dev/null +++ b/.github/workflows/apply-done-label.yml @@ -0,0 +1,13 @@ +# When a PR is merged, any associated issues will have a Done label applied +# The label will depend on the issue type, see: ./github/close-label.yml +name: 💡 Apply Done Label +on: + pull_request: + types: [opened, merged, closed] +jobs: + triage: + runs-on: ubuntu-latest + steps: + - uses: logerfo/close-label@0.0.4 + with: + repo-token: ${{ secrets.BOT_GITHUB_TOKEN }} From 96f6a845a2db9bb0f4f5d0721f4353805543e90e Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 5 Oct 2021 20:30:02 +0100 Subject: [PATCH 04/14] :bug: (#267) Fix custom search engine option --- src/components/Settings/SearchBar.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Settings/SearchBar.vue b/src/components/Settings/SearchBar.vue index 6174f9a7..9a1fa72d 100644 --- a/src/components/Settings/SearchBar.vue +++ b/src/components/Settings/SearchBar.vue @@ -129,7 +129,10 @@ export default { const searchEngine = searchPrefs.searchEngine || defaultSearchEngine; // Use either search bang, or preffered search engine const desiredSearchEngine = searchBang || searchEngine; - let searchUrl = findUrlForSearchEngine(desiredSearchEngine, searchEngineUrls); + const isCustomSearch = (searchPrefs.searchEngine === 'custom' && searchPrefs.customSearchEngine); + let searchUrl = isCustomSearch + ? searchPrefs.customSearchEngine + : findUrlForSearchEngine(desiredSearchEngine, searchEngineUrls); if (searchUrl) { // Append search query to URL, and launch searchUrl += encodeURIComponent(stripBangs(this.input, bangList)); this.launchWebSearch(searchUrl, openingMethod); From f517e31cd2e3a082be99c8f886cf9201bda96a59 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Tue, 5 Oct 2021 21:40:25 +0100 Subject: [PATCH 05/14] :fire: Refactors minimal search to share code of parent search --- src/components/MinimalView/MinimalSearch.vue | 195 ++----------------- src/components/Settings/SearchBar.vue | 68 ++++++- src/utils/Search.js | 3 +- src/views/Minimal.vue | 8 +- 4 files changed, 81 insertions(+), 193 deletions(-) diff --git a/src/components/MinimalView/MinimalSearch.vue b/src/components/MinimalView/MinimalSearch.vue index 74c8311b..bf88a8db 100644 --- a/src/components/MinimalView/MinimalSearch.vue +++ b/src/components/MinimalView/MinimalSearch.vue @@ -1,202 +1,39 @@ - - diff --git a/src/components/Settings/SearchBar.vue b/src/components/Settings/SearchBar.vue index 9a1fa72d..0058032f 100644 --- a/src/components/Settings/SearchBar.vue +++ b/src/components/Settings/SearchBar.vue @@ -1,5 +1,5 @@