Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: possible-railt…
Commits on May 26, 2012
  1. Check with bundler from github

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

    authored
    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

    authored
  3. Vijay Dev

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

    vijaydev authored
    Fix misprint in AR changelog
  4. Fix tests in railties

    authored
    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. Michal Papis

    improve #6318

    mpapis authored committed
  6. Merge pull request #6344 from erichmenge/patch_sqlite_time_type

    authored
    SQLite3 doesn't actually support the 'time' type.
  7. Alexey Vakhov

    Fix misprint in AR changelog

    avakhov authored
  8. Merge pull request #6346 from oscardelben/patch-9

    authored
    Remove useless check of adapter
  9. Oscar Del Ben
  10. Rafael Mendonça França

    Merge pull request #6343 from oscardelben/bump_sqlite3

    rafaelfranca authored
    Bump sqlite3 gem
  11. Oscar Del Ben

    Bumo sqlite3 gem

    oscardelben authored
  12. SQLite3 doesn't actually support the 'time' type.

    Erich Menge authored
Commits on May 15, 2012
  1. Rafael Mendonça França

    Merge pull request #6273 from KensoDev/feature/simple_format_refactoring

    rafaelfranca authored
    Feature/simple format refactoring
  2. Rafael Mendonça França

    Merge pull request #6333 from carlosgaldino/unnecessary-call

    rafaelfranca authored
    Remove unnecessary calls to primary_key on sqlite3_adapter
  3. Carlos Galdino
  4. Carlos Antonio da Silva

    Merge pull request #6325 from kennyj/fix_5832-3

    carlosantoniodasilva authored
    Remove unnecessary assertions.
  5. Carlos Antonio da Silva

    Merge pull request #6327 from nashby/string-interpolation

    carlosantoniodasilva authored
    remove backported string interpolation
  6. Vasiliy Ermolovich
  7. Jeremy Kemper

    Expand and improve #pluck docs

    jeremy authored
  8. Jeremy Kemper
  9. Carlos Antonio da Silva
  10. Toshinori Kajihara

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

    kennyj authored
    …'t same to the after_seq when using sequencer.
  11. Rafael Mendonça França

    Merge pull request #6322 from acapilleri/some_mispelling_errors

    rafaelfranca authored
    corrected some misspelling
  12. Angelo Capilleri

    corrected some misspelling

    acapilleri authored
  13. Aaron Patterson

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

    tenderlove authored
    [#5559] Do not black out the system timezone DST jump hour if Time.zone ...
  14. Carlos Antonio da Silva
  15. Carlos Antonio da Silva

    Merge pull request #6284 from acapilleri/dup_validation

    carlosantoniodasilva authored
    clean the erros if an object that includes validation  is duped.
  16. José Valim

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

    josevalim authored
    …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.
  17. José Valim

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

    josevalim authored
    …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.
  18. Vijay Dev

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

    vijaydev authored
    Conflicts:
    	actionpack/lib/action_view/helpers/asset_tag_helper.rb
  19. Vijay Dev

    missing dot [ci skip]

    vijaydev authored
  20. Vijay Dev
  21. José Valim

    Merge pull request #6318 from mpapis/master

    josevalim authored
    fix `bundle exec rails new app` not running `bundle install` properly
Something went wrong with that request. Please try again.