Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

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

Conversation

Projects
None yet
4 participants

Implements changes suggested in issue #1845 comments

Contributor

macfanatic commented Mar 7, 2013

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

Contributor

exviva commented Mar 8, 2013

Cool! This is related: ejholmes/active_admin_editor#20

Owner

seanlinsley commented Mar 15, 2013

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
Owner

seanlinsley commented Mar 24, 2013

Ping @michaelrshannon; this still needs tests!

Thanks - been away, will deal with this week.

Owner

seanlinsley commented Apr 7, 2013

It's been two weeks now :P

Owner

seanlinsley commented Apr 25, 2013

Closing this in favor of #2139

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment