Permalink
Switch branches/tags
Commits on May 26, 2012
  1. Check with bundler from github

    drogus committed May 26, 2012
Commits on May 16, 2012
  1. Don't use Gemfile in test application in railties

    drogus committed May 16, 2012
    Option to run `bundle install` after generating new appplication was
    added recently to rails. Since introduction, it contained a subtle bug
    that caused it to use `Gemfile` from current directory (if it exists)
    rather than from generated directory. This also accidentaly caused
    railties tests to work without any problems - after generating test app
    it just used `Gemfile` from the repository, rather than the one in
    generated app. After fixing the bug mentioned above, this of course
    broke. The easiest way to bypass that is to not generate a `Gemfile` for
    test application - with such setup Bundler will just use first available
    `Gemfile` in one of the parent directories.
  2. Remove unneeded tests

    drogus committed May 16, 2012
  3. Merge pull request #6347 from avakhov/ar-changelog-misprint

    vijaydev committed May 16, 2012
    Fix misprint in AR changelog
  4. Fix tests in railties

    drogus committed May 16, 2012
    Since `bundle install` was fixed in `rails plugin new`, it
    now requires `rails 4.0.0.beta` version in filesystem when
    running tests. Instead of providing it, we can run tested
    command with `--dev` option, to use rails from the local
    directory.
  5. improve #6318

    mpapis committed with drogus May 15, 2012
  6. Merge pull request #6344 from erichmenge/patch_sqlite_time_type

    drogus committed May 16, 2012
    SQLite3 doesn't actually support the 'time' type.
  7. Fix misprint in AR changelog

    avakhov committed May 16, 2012
  8. Merge pull request #6346 from oscardelben/patch-9

    drogus committed May 16, 2012
    Remove useless check of adapter
  9. Merge pull request #6343 from oscardelben/bump_sqlite3

    rafaelfranca committed May 16, 2012
    Bump sqlite3 gem
  10. Bumo sqlite3 gem

    oscardelben committed May 16, 2012
  11. SQLite3 doesn't actually support the 'time' type.

    Erich Menge committed May 16, 2012
Commits on May 15, 2012
  1. Merge pull request #6273 from KensoDev/feature/simple_format_refactoring

    rafaelfranca committed May 15, 2012
    Feature/simple format refactoring
  2. Merge pull request #6333 from carlosgaldino/unnecessary-call

    rafaelfranca committed May 15, 2012
    Remove unnecessary calls to primary_key on sqlite3_adapter
  3. Merge pull request #6325 from kennyj/fix_5832-3

    carlosantoniodasilva committed May 15, 2012
    Remove unnecessary assertions.
  4. Merge pull request #6327 from nashby/string-interpolation

    carlosantoniodasilva committed May 15, 2012
    remove backported string interpolation
  5. Expand and improve #pluck docs

    jeremy committed May 15, 2012
  6. Remove unnecessary assertions. We should only test the before_seq isn…

    kennyj committed May 15, 2012
    …'t same to the after_seq when using sequencer.
  7. Merge pull request #6322 from acapilleri/some_mispelling_errors

    rafaelfranca committed May 15, 2012
    corrected some misspelling
  8. corrected some misspelling

    acapilleri committed May 15, 2012
  9. Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-master

    tenderlove committed May 15, 2012
    [#5559] Do not black out the system timezone DST jump hour if Time.zone ...
  10. Merge pull request #6284 from acapilleri/dup_validation

    carlosantoniodasilva committed May 15, 2012
    clean the erros if an object that includes validation  is duped.
  11. Revert "Revert "Remove `:disable_with` in favor of `'data-disable-wit…

    josevalim committed May 15, 2012
    …h'` option from `submit_tag`, `button_tag` and `button_to` helpers.""
    
    Finally remove `:disable_with` but use `:data => { :disable_with => ... }`
    in examples to show off a better API (which looks nicer in Ruby 1.9)
    
    This reverts commit a5c38a9.
  12. Revert "Remove `:disable_with` in favor of `'data-disable-with'` opti…

    josevalim committed May 15, 2012
    …on from `submit_tag`, `button_tag` and `button_to` helpers."
    
    `disable_with:` is much easier to type than `"data-disable-with" =>`,
    and the fact it uses "data-disable-with" => is an implementation concern,
    it should not affect the public API.
    
    This reverts commit 683fc4d.
  13. Merge branch 'master' of github.com:lifo/docrails

    vijaydev committed May 15, 2012
    Conflicts:
    	actionpack/lib/action_view/helpers/asset_tag_helper.rb
  14. missing dot [ci skip]

    vijaydev committed May 15, 2012
  15. copy edit asset guide [ci skip]

    vijaydev committed May 15, 2012
  16. Merge pull request #6318 from mpapis/master

    josevalim committed May 15, 2012
    fix `bundle exec rails new app` not running `bundle install` properly