Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: activeadmin/activeadmin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: comboy/active_admin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 30 files changed
  • 3 contributors

Commits on Oct 29, 2011

  1. Only reload Active Admin if active admin files have changed 

    This is a HUGE performance increase in development mode. Before this
Active Admin was reloading on every single request to the servers
(assets included). Now we only reload the Active Admin files if
something in the AA load paths has changed.
    @gregbell
    gregbell committed Oct 29, 2011
    Configuration menu
    Copy the full SHA
    ef255e5 View commit details
    Browse the repository at this point in the history

  2. Bumping version to 0.3.3

    @gregbell
    gregbell committed Oct 29, 2011
    Configuration menu
    Copy the full SHA
    c8fa4a6 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2011

  1. Fix for active admin reloading issues in #707

    @gregbell
    gregbell committed Nov 8, 2011
    Configuration menu
    Copy the full SHA
    6b9be9e View commit details
    Browse the repository at this point in the history

  2. Ensure that SASS doesn't reload on every request. 

    Thanks to @dhiemstra!

View the details at https://gist.github.com/1348501
    @gregbell
    gregbell committed Nov 8, 2011
    Configuration menu
    Copy the full SHA
    97425ca View commit details
    Browse the repository at this point in the history

  3. Added to CHANGELOG and bumped to 0.3.4

    @gregbell
    gregbell committed Nov 8, 2011
    Configuration menu
    Copy the full SHA
    e98e892 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2011

  1. fix undefined mixin 'global-reset'

    @andrewroth
    andrewroth committed Dec 7, 2011
    Configuration menu
    Copy the full SHA
    8ecd322 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 810-fix-undefined-mixin-global-reset 

    Conflicts:
	app/assets/stylesheets/active_admin/components/_tables.css.scss
	app/assets/stylesheets/active_admin/mixins/_utilities.scss
    @andrewroth
    andrewroth committed Dec 7, 2011
    Configuration menu
    Copy the full SHA
    b2e4ea7 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2012

  1. Merge remote branch 'andrewroth/810-fix-undefined-mixin-global-reset'

    @comboy
    comboy committed Feb 13, 2012
    Configuration menu
    Copy the full SHA
    09faef4 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2012

  1. make it working with rails 3.2 (feels wrong) 

    It feels so wrong I'd rather hide away with that commit, but I did not
have time to dive in and check what changed about precompilation
(because that's what's failing without this change). It most likely
should be done in some smarter way :full_derp:
    @comboy
    comboy committed Feb 14, 2012
    Configuration menu
    Copy the full SHA
    ddd0e7b View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2012

  1. fix form block evaluation context

    @comboy
    comboy committed Feb 21, 2012
    Configuration menu
    Copy the full SHA
    85a74db View commit details
    Browse the repository at this point in the history

  2. evaluate filter collection as block in the view context

    @comboy
    comboy committed Feb 21, 2012
    Configuration menu
    Copy the full SHA
    631911e View commit details
    Browse the repository at this point in the history

  3. Merge remote branch 'gregbell/master' 

    Conflicts:
	lib/active_admin/inputs/filter_base.rb
    @comboy
    comboy committed Feb 21, 2012
    Configuration menu
    Copy the full SHA
    0923869 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2012

  1. Merge branch 'original'

    @comboy
    comboy committed Apr 16, 2012
    Configuration menu
    Copy the full SHA
    befd90e View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2012

  1. update fixes for precompilation failing on 3.2 

    related to issue #810
    @comboy
    comboy committed Apr 17, 2012
    Configuration menu
    Copy the full SHA
    8044caf View commit details
    Browse the repository at this point in the history
Loading