Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on May 4, 2015
  1. @Fivell
  2. @kirillplatonov
  3. @timoschilling

    Merge pull request #3931 from activeadmin/use-latest-rails-as-default

    timoschilling authored
    use most recent Rails version by default
  4. @seanlinsley
  5. @seanlinsley

    list integrations in docs/0-installation.md

    seanlinsley authored
    clarifying the issue raised in #3885
  6. @seanlinsley
Commits on May 3, 2015
  1. @timoschilling

    Merge pull request #3928 from Fivell/cleanup_has_many_proxy

    timoschilling authored
    remove unused code from HasManyProxy
  2. @Fivell
Commits on Apr 28, 2015
  1. @timoschilling

    Merge pull request #3919 from tf/meta-tags

    timoschilling authored
    Support for Custom Meta Tags
  2. @tf

    Support for Custom Meta Tags

    tf authored tf committed
    Add `meta_tags` and `meta_tags_for_logged_out_pages` settings to
    application.
  3. @timoschilling

    Merge pull request #3917 from tf/cucumber-asset-steps

    timoschilling authored
    Fix XPath Matchers in Cucumber Asset Steps
  4. @tf

    Fix XPath Matchers in Cucumber Asset Steps

    tf authored
    The step definitions looking for assets in the page head produced
    false positives since quotes were missing inside the XPath
    expressions.
    
    XPath expressions of the form `"contains(@href, #{path})"` matched no
    matter what `path` was supplied. In one case even the string
    interpolation was missing: `"contains(@href, path)"`. Surrounding the
    literals with single quotes caused actual checks to be performed and
    revealed outdated information inside the tests:
    
    * The generated assets paths actually start with `assets/` in some
      Rails versions instead of `javascripts/` and `stylesheets/`. Remove
      the prefix to make tests pass.
    
    * The `active_admin.css` does not live inside an `admin` directory.
    
    * `registering_assets.features` asserted presence of a file called
      `active_admin_vendor.js` not mentioned elsewhere in the codebase
Commits on Apr 25, 2015
  1. @timoschilling
Commits on Apr 24, 2015
  1. @fauno
Commits on Apr 22, 2015
  1. @timoschilling
  2. @timoschilling
  3. @timoschilling

    Merge branch '2217-support-namespaced-belongs-to' of https://github.c…

    timoschilling authored
    …om/bamorim/active_admin into bamorim-2217-support-namespaced-belongs-to
Commits on Apr 17, 2015
  1. @timoschilling

    fix xss in model dialog

    timoschilling authored
    refs #3811 close #3804
    
    There was a possible XSS injection in the modal dialog js. A String like `"</option><script>alert('ok')</script><option>foo"` whould be executed in the Browser.
    
    With this fix it looks still like a XSS in the Browser DOM, but it's not be executed anymore.
Commits on Apr 15, 2015
  1. @timoschilling

    Merge pull request #3897 from Fivell/form_builder_fix

    timoschilling authored
    fixed form builder when using 'for' option
  2. @Fivell
  3. @timoschilling

    Merge pull request #3896 from Fivell/typo_fix

    timoschilling authored
    spelling fix
Commits on Apr 14, 2015
  1. @timoschilling

    Merge pull request #3895 from kivanio/3866-add-brazilian-locale

    timoschilling authored
    update brazilian locale
  2. @kivanio

    update brazilian locale

    kivanio authored
Commits on Apr 13, 2015
  1. @Fivell

    spelling fix

    Fivell authored
  2. @timoschilling
  3. @timoschilling

    Merge pull request #3825 from ccallebs/3807-add-optional-boilerplate

    timoschilling authored
    Optional Boilerplate Generation
  4. @timoschilling

    Merge pull request #3893 from knu/fix_cancel_button

    timoschilling authored
    Cancel buttons are now unstyled
  5. @knu

    Style cancel buttons again.

    knu authored
Commits on Apr 11, 2015
  1. @timoschilling
  2. @davydovanton

    Update russian locale

    davydovanton authored
  3. @timoschilling

    Merge pull request #3848 from losvedir/3847-fix-pagination-total-false

    timoschilling authored
    Fix pagination_total index option to prevent SELECT count(*) queries
    close #2638
    refs #2333, #2283
Commits on Apr 10, 2015
  1. @timoschilling

    Merge pull request #3889 from javierjulio/remove-old-popovers-code

    timoschilling authored
    Remove popover component and related code
  2. @javierjulio
  3. @javierjulio

    Remove popover component and related code

    javierjulio authored
    The popover component has since been replaced with dropdown menu so
    this is no longer needed or supported. Renamed
    batch_action_popover_spec to batch_action_selector_spec to test the
    correct existing class. These changes include those started in
    @seanlinsley’s original PR #2021 which wasn’t merged in because at the
    time there was work being done on migrating AA to use Bootstrap that
    has since remained incomplete and inactive.
  4. @losvedir

    Fix pagination_total index option to prevent SELECT count(*) queries

    losvedir authored
    The pagination_total option is supposed to prevent expensive SELECT
    count(*) queries from being performed when viewing a resource's index
    page.
    
    However, while this option was hiding the display of the total number of
    pages, it did not actually prevent the query from being performed.
    
    There were two reasons:
    
    In `#build_pagination`, the line:
    
    `text_node paginate collection, options`
    
    would trigger Kaminari to call `#total_pages` on the collection, which would
    trigger the query:
    
    ```
        def paginate(scope, options = {}, &block)
          options[:total_pages] ||= options[:num_pages] || scope.total_pages
    ```
    
    By passing in the `:total_pages` option, we short circuit this assignment
    and avoid the query.
    
    That fix was not sufficient. In `#page_entries_info`, the call
    `collection.num_pages` also triggered a SELECT count(*). I re-arranged
    the conditionals to avoid that call if `@display_total` is false, while
    trying to keep the behavior the same.
Something went wrong with that request. Please try again.