Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Oct 22, 2015
  1. @timoschilling

    Merge pull request #4168 from theirishpenguin/penguin/update-csv-docs

    timoschilling committed
    Updated csv docs with how to preserve case in csv col headers.
Commits on Oct 20, 2015
  1. @timoschilling

    Merge pull request #4166 from bolshakov/feature/allow_to_apply_custom…

    timoschilling committed
    Allow to apply custom decorations
  2. @bolshakov
  3. @bolshakov
  4. @bolshakov
Commits on Oct 13, 2015
  1. @seanlinsley

    Merge pull request #4125 from danielevans/features/configure_inclusio…

    seanlinsley committed
    Add configuration for including association filters by default
  2. @seanlinsley

    Merge pull request #4156 from shishir127/4147-base-controller-gotcha

    seanlinsley committed
    Added documentation for the gotcha discussed in issue 4147
  3. @seanlinsley

    remove badge

    seanlinsley committed
    since it looks like no one is using it
  4. @seanlinsley

    remove Gittip / Gratipay badge

    seanlinsley committed
    The project is effectively dead in the water. There's no point linking to them any longer.
Commits on Oct 12, 2015
  1. @shishir127
  2. @timoschilling

    Merge pull request #4154 from mabras/master

    timoschilling committed
    Update ar.yml
  3. @mabras

    Update ar.yml

    mabras committed
Commits on Oct 11, 2015
  1. @seanlinsley

    update .travis.yml

    seanlinsley committed
    - remove unnecessary quotes
    - stop testing Ruby 2.1
    - ensure latest Ruby 2.2 is used (RVM oddly chooses 2.2.0)
    - test latest Rails 4.1 and 4.2
  2. @seanlinsley
  3. @seanlinsley
  4. @seanlinsley

    #3930 forces deprecation warnings to cause test failures, so we're

    seanlinsley committed
    forced to fix them. This is one deprecation:
    >DEPRECATION WARNING: Using ActiveRecord's `find` on a
    CollectionDecorator is deprecated. Call `find` on a model, and then
    decorate the result. (called from block in add_default_batch_action at
    lib/active_admin/batch_actions/resource_extension.rb:73) (StandardError)
    This issue was introduced by #3775, which started decorating
    collections for batch actions. The Draper ticket that resulted in the
    deprecation is: drapergem/draper#509.
    The simple solution would be to no longer decorate the batch action
    collections, which is what this commit does.
  5. @seanlinsley
  6. @seanlinsley

    use `columns_hash` to get around deprecation warning

    seanlinsley committed
    we couldn’t use `type_for_column` since:
    - it’s not intended as a public method and
    - it would return a null object if the column had the default value (nil)
    for example:
    expected: "No"
         got: ""
    (compared using ==)
    ./features/step_definitions/table_steps.rb:96:in `assert_cells_match'
    ./features/step_definitions/table_steps.rb:79:in `block (2 levels) in assert_tables_match'
    ./features/step_definitions/table_steps.rb:75:in `each_index'
    ./features/step_definitions/table_steps.rb:75:in `block in assert_tables_match'
    ./features/step_definitions/table_steps.rb:74:in `each_index'
    ./features/step_definitions/table_steps.rb:74:in `assert_tables_match'
    ./features/step_definitions/table_steps.rb:115:in `/^I should see the "([^"]*)" table:$/'
    features/index/index_as_table.feature:252:in `Then I should see the "index_table_posts" table:'
    Failing Scenarios:
    cucumber features/index/index_as_table.feature:244 # Scenario: Sorting
  7. @seanlinsley
  8. @seanlinsley

    Merge pull request #4144 from hobbes37/patch-1

    seanlinsley committed
Commits on Oct 2, 2015
  1. @timoschilling

    Merge pull request #4146 from tjgrathwell/lock-shoulda-matchers

    timoschilling committed
    Lock shoulda matchers to 2.8.0
  2. @tjgrathwell

    Lock shoulda-matchers to 2.8.0

    tjgrathwell committed
    shoulda-matchers 3 drops suport for Rails 3.x and Ruby 1.9,
    making it incompatible with the ActiveAdmin test matrix
Commits on Sep 30, 2015
  1. @hobbes37


    hobbes37 committed
    Fixed installation instructions so that users can log in as the default admin after installing.
Commits on Sep 26, 2015
  1. @timoschilling

    Merge pull request #4139 from jethroo/chore/increase_test_coverage_of…

    timoschilling committed
    adding tests for public methods of index_as_blog.rb
Commits on Sep 25, 2015
  1. adding tests for public methods of

    Carsten Wirth committed
Commits on Sep 24, 2015
  1. @timoschilling

    Merge pull request #4085 from asyrovatsky/master

    timoschilling committed
    Fix clear filters button
  2. @timoschilling

    Merge pull request #4116 from keichan34/csv-builder-encoding-options

    timoschilling committed
    Don't pass encoding_options to CSV
  3. @keichan34

    Don't pass encoding_options to CSV

    keichan34 committed
    CSV will raise an error when you pass it an unrecognized key, but it's
    used in #encode.
Commits on Sep 23, 2015
  1. @timoschilling

    Merge pull request #4135 from activeadmin/timoschilling-execjs

    timoschilling committed
    remove execjs limitation from gemfile
  2. @timoschilling
  3. @timoschilling

    update readme for pre2

    timoschilling committed
  4. @timoschilling

    release v1.0.0.pre2

    timoschilling committed
  5. @timoschilling
  6. @timoschilling
Something went wrong with that request. Please try again.