gregbell/active_admin — pull request #1047 by parndt (2012-02-19 20:54:32+00:00)
Title: Renamed auto_link helper to auto_admin_link so that it doesn't conflict with rails_autolink or rails implementaiton of auto_link in versions < 3.1.

Renamed auto_link helper to auto_admin_link so that it doesn't conflict with rails_autolink or rails implementaiton of auto_link in versions < 3.1.

Redefining this function with different functionality and a different interface was causing issues for us and I expect it might cause issues for others down the track.

This is due to #687 being unmergable and so after managing the merge conflict, this version can be. It was only two small conflicts due to similar code changes in both versions.