Skip to content
Commits on May 26, 2012
  1. @drogus

    One more try

    drogus committed May 27, 2012
  2. @drogus

    Display bundler version

    drogus committed May 26, 2012
  3. @drogus
  4. @drogus

    Check with bundler from github

    drogus committed May 26, 2012
Commits on May 16, 2012
  1. @drogus

    Don't use Gemfile in test application in railties

    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.
    drogus committed May 16, 2012
  2. @drogus
  3. @drogus

    Remove unneeded tests

    drogus committed May 16, 2012
  4. @vijaydev

    Merge pull request #6347 from avakhov/ar-changelog-misprint

    Fix misprint in AR changelog
    vijaydev committed May 15, 2012
  5. @drogus

    Fix tests in railties

    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.
    drogus committed May 15, 2012
  6. @mpapis @drogus

    improve #6318

    mpapis committed with drogus May 15, 2012
  7. @drogus

    Merge pull request #6344 from erichmenge/patch_sqlite_time_type

    SQLite3 doesn't actually support the 'time' type.
    drogus committed May 15, 2012
  8. @avakhov

    Fix misprint in AR changelog

    avakhov committed May 16, 2012
  9. @drogus

    Merge pull request #6346 from oscardelben/patch-9

    Remove useless check of adapter
    drogus committed May 15, 2012
  10. @oscardelben
  11. @rafaelfranca

    Merge pull request #6343 from oscardelben/bump_sqlite3

    Bump sqlite3 gem
    rafaelfranca committed May 15, 2012
  12. @oscardelben

    Bumo sqlite3 gem

    oscardelben committed May 15, 2012
  13. SQLite3 doesn't actually support the 'time' type.

    Erich Menge committed May 15, 2012
Commits on May 15, 2012
  1. @rafaelfranca

    Merge pull request #6273 from KensoDev/feature/simple_format_refactoring

    Feature/simple format refactoring
    rafaelfranca committed May 15, 2012
  2. @rafaelfranca

    Merge pull request #6333 from carlosgaldino/unnecessary-call

    Remove unnecessary calls to primary_key on sqlite3_adapter
    rafaelfranca committed May 15, 2012
  3. @carlosgaldino
  4. @carlosantoniodasilva

    Merge pull request #6325 from kennyj/fix_5832-3

    Remove unnecessary assertions.
    carlosantoniodasilva committed May 15, 2012
  5. @carlosantoniodasilva

    Merge pull request #6327 from nashby/string-interpolation

    remove backported string interpolation
    carlosantoniodasilva committed May 15, 2012
  6. @nashby
  7. @jeremy

    Expand and improve #pluck docs

    jeremy committed May 15, 2012
  8. @jeremy
  9. @carlosantoniodasilva
  10. @kennyj

    Remove unnecessary assertions. We should only test the before_seq isn…

    …'t same to the after_seq when using sequencer.
    kennyj committed May 16, 2012
  11. @rafaelfranca

    Merge pull request #6322 from acapilleri/some_mispelling_errors

    corrected some misspelling
    rafaelfranca committed May 15, 2012
  12. @acapilleri

    corrected some misspelling

    acapilleri committed May 15, 2012
  13. @tenderlove

    Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-master

    [#5559] Do not black out the system timezone DST jump hour if Time.zone ...
    tenderlove committed May 15, 2012
  14. @carlosantoniodasilva
  15. @carlosantoniodasilva

    Merge pull request #6284 from acapilleri/dup_validation

    clean the erros if an object that includes validation  is duped.
    carlosantoniodasilva committed May 15, 2012
  16. @josevalim

    Revert "Revert "Remove `:disable_with` in favor of `'data-disable-wit…

    …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.
    josevalim committed May 15, 2012
  17. @josevalim

    Revert "Remove `:disable_with` in favor of `'data-disable-with'` opti…

    …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.
    josevalim committed May 15, 2012
  18. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    Conflicts:
    	actionpack/lib/action_view/helpers/asset_tag_helper.rb
    vijaydev committed May 15, 2012
Something went wrong with that request. Please try again.