Skip to content
Commits on Aug 3, 2015
  1. @timoschilling

    Merge pull request #4049 from buren/sv-SE-i18n-update

    Translated missing sv-SE strings
    timoschilling committed Aug 3, 2015
  2. @buren

    Translated missing sv-SE strings

    buren committed Aug 3, 2015
  3. @timoschilling

    fix en translation

    >  I noticed an inconsistency in en.yml. "Resend" is used in most places except on line 121 and 122 where "Re-send" is used
    Hint from @buren in #4049
    timoschilling committed Aug 3, 2015
Commits on Aug 2, 2015
  1. @timoschilling

    Merge pull request #4041 from l4u/rename-scss-extension

    Rename active_admin.css.scss to active_admin.scss
    timoschilling committed Aug 2, 2015
Commits on Jul 30, 2015
  1. @timoschilling
Commits on Jul 25, 2015
  1. @l4u
Commits on Jul 23, 2015
  1. @deivid-rodriguez
Commits on Jul 18, 2015
  1. @deivid-rodriguez

    Skip memory specs in JRuby

    GC.start does nothing on JRuby ([1], [2]), so tests cannot pass. I
    tried to get something working using [3], but they are unreliable
    because the garbage collector always run asyncronously in JRuby. So I
    think it's better to just skip those in JRuby. There's no specific JRuby
    code in AA, so any regression here will be caugth be the MRI test.
    
    [1]: http://blog.headius.com/2012/09/explanation-of-warnings-from-mris-test.html
    [2]: jruby/jruby#221
    [3]: https://blog.engineyard.com/2010/monitoring-the-jvm-heap-with-jruby
    deivid-rodriguez committed Jul 18, 2015
  2. @deivid-rodriguez

    We're tagging request specs, so use the tags

    It's more resilient than a hardcoded path.
    deivid-rodriguez committed Jul 18, 2015
  3. @deivid-rodriguez

    Enable request specs

    deivid-rodriguez committed Jul 18, 2015
  4. @deivid-rodriguez
  5. @deivid-rodriguez

    Exclude Rails 3.2.22 from jruby-head build

    jruby-head is 2.2 compatible and Rails 3.2.22 is excluded from MRI 2.2
    build, so I guess the reason jruby-head is failing is the same.
    deivid-rodriguez committed Jul 17, 2015
  6. @deivid-rodriguez

    Enable the debug flag in jruby

    It's needed to be able to report accurate test coverage.
    deivid-rodriguez committed Jul 17, 2015
  7. @deivid-rodriguez

    Fix failing scenarios in jruby

    I'm not sure why but somehow some assertions don't seem to wait for the
    content to appear in jruby. Migrating this tests to use a javascript
    driver fixes it.
    
    Furthermore, I think this is a good change (except for performance)
    because this tests are actually supposed test js behaviour. The only
    reason they were passing with a non-js driver is that they manually
    simulate the js behaviour. See the "When I submit the batch action form"
    step for an example. It's not testing the real behavior of the user, so
    if any regressions are introduced where that stuff actually happens
    (batch_actions.js.coffee), they won't be catched by the test.
    
    Regarding the actual migration of the tests, it includes a couple of
    changes to avoid using :contains or :first that are not valid css
    selectors and are only working "by chance" (see [1], last comment) and a
    rewrite of the previously mentioned step at a higher level to actually
    trigger the js that is being tested.
    
    [1]: teampoltergeist/poltergeist#323
    deivid-rodriguez committed Jul 17, 2015
Commits on Jul 17, 2015
  1. @kennethkalmer @deivid-rodriguez
  2. @kennethkalmer @deivid-rodriguez
  3. @kennethkalmer @deivid-rodriguez

    chore: added jruby-head (allowing failures) to travis

    Also increase allowed memory usage
    kennethkalmer committed with deivid-rodriguez Feb 13, 2015
  4. @kennethkalmer @deivid-rodriguez

    chore: specified different platforms for development/test dependencie…

    …s so we can install on jruby
    kennethkalmer committed with deivid-rodriguez Feb 13, 2015
Commits on Jul 16, 2015
  1. @timoschilling

    Merge pull request #4031 from krautcomputing/fix_devise_generator

    add missing require to devise generator
    timoschilling committed Jul 17, 2015
  2. @manuelmeurer
Commits on Jul 14, 2015
  1. @timoschilling

    Merge pull request #4026 from tinogomes/add_localize_format_to_the_co…

    …nfiguration
    
    add localize format to the configuration
    timoschilling committed Jul 14, 2015
  2. @tinogomes
  3. @buermann @timoschilling

    3978: When generating the nested attributes for an undefined has_one

    relationship form builder blows up with "undefined method '<<' for
    nil:NilClass" because the content has been initialized as nil.
    Defensively setting content to an empty html_safe string resolves the
    issue.
    
    Added rudimentary test coverage for a has_one relationship.
    close #3978 #4010
    buermann committed with timoschilling Jun 26, 2015
Commits on Jul 13, 2015
  1. @timoschilling

    Revert "upgrade Rails versions on Travis"

    This reverts commit e6d0c3f.
    timoschilling committed Jul 13, 2015
  2. @timoschilling

    Merge pull request #4030 from wonook/4029-improvementsOnKoreanTransla…

    …tions
    
    4029-ImprovementsOnKoreanTranslations
    close #4029
    timoschilling committed Jul 13, 2015
  3. @wonook
Commits on Jul 9, 2015
  1. @timoschilling

    Merge pull request #4023 from adambrod/pretty_format_symbols

    Enable pretty_format to handle Symbols
    timoschilling committed Jul 9, 2015
Commits on Jul 8, 2015
  1. @adambrod
Commits on Jul 6, 2015
  1. @timoschilling

    fix some typos

    timoschilling committed Jul 6, 2015
Commits on Jul 4, 2015
  1. @timoschilling

    Merge pull request #4021 from scarver2/comments

    added created_at to comments/index
    closes #4020
    timoschilling committed Jul 4, 2015
Commits on Jul 3, 2015
  1. @scarver2
  2. @timoschilling

    Merge pull request #4019 from workgena/modal_dialog_trigger_events

    ActiveAdmin.modal_dialog fire events before_open and after_open
    timoschilling committed Jul 3, 2015
Commits on Jul 2, 2015
  1. @timoschilling

    Merge pull request #4018 from Fivell/fix_batch_action_path_4000

    batch_action_path includes :q and :scope params
    timoschilling committed Jul 2, 2015
  2. @Fivell
Something went wrong with that request. Please try again.