Skip to content
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

Fixes #1845 - Default assets registered twice by ActiveAdmin.setup #1974

Closed
wants to merge 1 commit into from
Closed

Fixes #1845 - Default assets registered twice by ActiveAdmin.setup #1974

wants to merge 1 commit into from

Conversation

michaelrshannon
Copy link

Implements changes suggested in issue #1845 comments

@macfanatic
Copy link
Contributor

Will you please add a spec for this in spec/unit/asset_registration_spec.rb?

@exviva
Copy link
Contributor

exviva commented Mar 8, 2013

Cool! This is related: ejholmes/active_admin_editor#20

@seanlinsley
Copy link
Contributor

Our Travis builds on master are now green (as of 166bc46). Please rebase your PR on the current master:

# Expectations: "upstream" is gregbell's GitHub repo and "origin" is your fork

# Rebase your fork's master branch with the latest upstream changes
git checkout master
git pull --rebase upstream master
git push origin master

# Rebase your feature branch with the latest upstream changes
git checkout your_feature_branch
git pull --rebase upstream master
git push origin your_feature_branch # note that you may need to use -f

@seanlinsley
Copy link
Contributor

Ping @michaelrshannon; this still needs tests!

@michaelrshannon
Copy link
Author

Thanks - been away, will deal with this week.

@seanlinsley
Copy link
Contributor

It's been two weeks now :P

@seanlinsley
Copy link
Contributor

Closing this in favor of #2139

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants