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

#4169 tag search autocomplete #4335

Merged
merged 1 commit into from Aug 6, 2013

Conversation

Projects
None yet
2 participants
@juliaguar
Contributor

juliaguar commented Jul 31, 2013

This implements the autocomplete in the header search box for tags with a new search controller and new tests.

@jhass

View changes

Show outdated Hide outdated config/routes.rb
@jhass

View changes

Show outdated Hide outdated app/controllers/search_controller.rb
@jhass

View changes

Show outdated Hide outdated app/controllers/search_controller.rb
@jhass

View changes

Show outdated Hide outdated app/controllers/search_controller.rb
@jhass

View changes

Show outdated Hide outdated app/controllers/search_controller.rb
@jhass

This comment has been minimized.

Show comment
Hide comment
@jhass

jhass Aug 1, 2013

Member

Alright some rebase got wrong so we need to clean that up:

git fetch upstream
git branch -m feature/4169-tag_search_autocomplete feature/4169-tag_search_autocomplete-bak
git checkout -b feature/4169-tag_search_autocomplete upstream/develop
git cherry-pick 29da8ae3dc2c90ce0877c4d68eb2d620ddfdf94c
git cherry-pick dfa768ab34f3984d04ddae69978260afdf913cfc
git cherry-pick 9ca15fff32c33079c8284aaffee4d4e0027d33e3
git cherry-pick c3d98321c3db370d76f96b76cc3438e858d707cd
git cherry-pick e6db97bcfdaf590a1257cff55b86a8a474a5b683
git cherry-pick bb3bc22c961a42ee04c1bb655a9264d7620ba203
git rebase -i upstream/develop # Choose pick for the first line, squash for all others
git push -f origin feature/4169-tag_search_autocomplete
Member

jhass commented Aug 1, 2013

Alright some rebase got wrong so we need to clean that up:

git fetch upstream
git branch -m feature/4169-tag_search_autocomplete feature/4169-tag_search_autocomplete-bak
git checkout -b feature/4169-tag_search_autocomplete upstream/develop
git cherry-pick 29da8ae3dc2c90ce0877c4d68eb2d620ddfdf94c
git cherry-pick dfa768ab34f3984d04ddae69978260afdf913cfc
git cherry-pick 9ca15fff32c33079c8284aaffee4d4e0027d33e3
git cherry-pick c3d98321c3db370d76f96b76cc3438e858d707cd
git cherry-pick e6db97bcfdaf590a1257cff55b86a8a474a5b683
git cherry-pick bb3bc22c961a42ee04c1bb655a9264d7620ba203
git rebase -i upstream/develop # Choose pick for the first line, squash for all others
git push -f origin feature/4169-tag_search_autocomplete
update search controller + serch.js so that autocomplete works
Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec

Fixed merged conflict in Changelog

update routes and search controller

remove useless except from search controller

Fix indentation in search_controller
@jhass

This comment has been minimized.

Show comment
Hide comment
@jhass

jhass Aug 6, 2013

Member

Looks good, thank you!

Member

jhass commented Aug 6, 2013

Looks good, thank you!

jhass added a commit that referenced this pull request Aug 6, 2013

@jhass jhass merged commit a2e5f1f into diaspora:develop Aug 6, 2013

1 check passed

default The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment