Skip to content

Simplify search field handling code #2475

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

Merged
merged 5 commits into from
Apr 30, 2020
Merged

Simplify search field handling code #2475

merged 5 commits into from
Apr 30, 2020

Conversation

Turbo87
Copy link
Member

@Turbo87 Turbo87 commented Apr 30, 2020

This PR simplifies the code that handles the values of the two search boxes in the header. It mainly gets rid of a query param alias(), an unnecessary oneWay() property and two controllerFor() lookups. It also removes the search service and adds a new header service instead.

r? @locks

@locks
Copy link
Contributor

locks commented Apr 30, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Apr 30, 2020

📌 Commit e932ee8 has been approved by locks

@bors
Copy link
Contributor

bors commented Apr 30, 2020

☔ The latest upstream changes (presumably #2474) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Apr 30, 2020

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout search (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self search --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging app/services/header.js
Auto-merging app/routes/index.js
CONFLICT (content): Merge conflict in app/routes/index.js
Automatic merge failed; fix conflicts and then commit the result.

@Turbo87
Copy link
Member Author

Turbo87 commented Apr 30, 2020

@bors r=@locks

@bors
Copy link
Contributor

bors commented Apr 30, 2020

📌 Commit 884c1d3 has been approved by locks

@bors
Copy link
Contributor

bors commented Apr 30, 2020

⌛ Testing commit 884c1d3 with merge ecfa77a...

@bors
Copy link
Contributor

bors commented Apr 30, 2020

☀️ Test successful - checks-travis
Approved by: locks
Pushing ecfa77a to master...

@bors bors merged commit ecfa77a into rust-lang:master Apr 30, 2020
@Turbo87 Turbo87 deleted the search branch May 1, 2020 09:03
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.

4 participants