-
Notifications
You must be signed in to change notification settings - Fork 113
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 contributor search #1222
Merged
nellshamrell
merged 16 commits into
chef:master
from
nellshamrell:add-contributor-search
Feb 17, 2016
Merged
Add contributor search #1222
nellshamrell
merged 16 commits into
chef:master
from
nellshamrell:add-contributor-search
Feb 17, 2016
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nellshamrell
force-pushed
the
add-contributor-search
branch
from
February 10, 2016 23:31
7c251bf
to
04c0ee4
Compare
removes duplicate feature specs
wip - calculating @all_contributors when displaying all ICLA signatures wip - includes ContributorSearch module in ICLA and CCLA signature controllers wip - continues to determine contributors/signature counts in shared controller concern Revert "wip - continues to determine contributors/signature counts in shared controller concern" This reverts commit fb597d2. Revert "wip - includes ContributorSearch module in ICLA and CCLA signature controllers" This reverts commit 2a35b18. Revert "wip - calculating @all_contributors when displaying all ICLA signatures" This reverts commit 3543230. Revert "wip" This reverts commit 6823998.
adds integration specs around searching for a company adds code to show what fields a user can search contributors, icla signers, or ccla signers by forgive me rubocop, for I have sinned... corrects variable assignment in a condition that rubocop was cranky about
nellshamrell
force-pushed
the
add-contributor-search
branch
from
February 10, 2016 23:34
04c0ee4
to
6ecb8c3
Compare
@@ -55,4 +61,8 @@ def find_contributor | |||
def contributor_params | |||
params.require(:contributor).permit(:admin) | |||
end | |||
|
|||
def authorized_users_from_search(search_param) | |||
User.search(search_param) & User.authorized_contributors |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🏆
👍 🚀 🍰 🍣 |
woohoo |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1148