| Commit message (Expand) | Author | Age | Files | Lines |
* | validate :on option on after_commit and after_rollback callbacks | Pascal Friederich | 2012-12-26 | 3 | -6/+29 |
* | Merge pull request #8608 from senny/8576_cant_inherit_from_deprecated_buffere... | Rafael Mendonça França | 2012-12-25 | 2 | -1/+19 |
|\ |
|
| * | deprecation warning when BufferedLogger is instantiated | Yves Senn | 2012-12-25 | 2 | -1/+19 |
* | | Merge pull request #8609 from senny/buffered_logger_documentation | Guillermo Iguaran | 2012-12-25 | 3 | -5/+5 |
|\ \
| |/
|/| |
|
| * | replace AS::BufferedLogger doc mentions with AS::Logger | Yves Senn | 2012-12-25 | 3 | -5/+5 |
|/ |
|
* | Merge pull request #8607 from senny/8576_cant_inherit_from_deprecated_buffere... | Rafael Mendonça França | 2012-12-25 | 2 | -2/+20 |
|\ |
|
| * | ActiveSupport::BufferedLogger can be subclassed | Yves Senn | 2012-12-25 | 2 | -2/+20 |
|/ |
|
* | Merge pull request #8592 from rafaelfranca/warning_fix | Guillermo Iguaran | 2012-12-24 | 1 | -1/+5 |
|\ |
|
| * | Remove warning of intance variable not initialized | Rafael Mendonça França | 2012-12-23 | 1 | -1/+5 |
* | | Merge pull request #8604 from zoltankiss/minor_fixes | Guillermo Iguaran | 2012-12-24 | 1 | -1/+1 |
|\ \ |
|
| * | | minor grammar fix | Zoltan Kiss | 2012-12-24 | 1 | -1/+1 |
|/ / |
|
* | | silences "possibly useless use of :: in void context" warnings | Xavier Noria | 2012-12-24 | 1 | -7/+3 |
* | | Merge pull request #8601 from amatsuda/chmod_x | Rafael Mendonça França | 2012-12-24 | 2 | -0/+0 |
|\ \ |
|
| * | | chmod -x from non-script files | Akira Matsuda | 2012-12-24 | 2 | -0/+0 |
|/ / |
|
* | | Merge pull request #8595 from amatsuda/regex_warning | Rafael Mendonça França | 2012-12-23 | 1 | -1/+1 |
|\ \ |
|
| * | | "warning: ambiguous first argument; put parentheses or even spaces" | Akira Matsuda | 2012-12-24 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #8594 from amatsuda/rm_sqlite2 | Guillermo Iguaran | 2012-12-23 | 1 | -13/+5 |
|\ \ |
|
| * | | we're not supporting SQLite 2 | Akira Matsuda | 2012-12-24 | 1 | -13/+5 |
| |/ |
|
* | | Explicit options should have precedence over railsrc on the `rails new` | Rafael Mendonça França | 2012-12-24 | 2 | -2/+5 |
* | | Merge pull request #8593 from shime/master | Rafael Mendonça França | 2012-12-23 | 1 | -2/+0 |
|\ \
| |/
|/| |
|
| * | remove duplication from Rails::Application docs | Hrvoje Šimić | 2012-12-24 | 1 | -2/+0 |
|/ |
|
* | Merge pull request #8588 from marcandre/fix_reversible | Carlos Antonio da Silva | 2012-12-23 | 5 | -9/+24 |
|\ |
|
| * | Fixes for PR [#8267] | Marc-Andre Lafortune | 2012-12-22 | 5 | -9/+24 |
* | | Fix spacing regression in scaffold generator | Yehuda Katz | 2012-12-22 | 1 | -1/+3 |
* | | Fix syntax error in controller template | Guillermo Iguaran | 2012-12-22 | 1 | -4/+12 |
* | | adds kindlerb to the :doc bundle group for guides generation | Xavier Noria | 2012-12-22 | 1 | -0/+1 |
* | | Ignore /bin on new apps | José Valim | 2012-12-22 | 1 | -3/+4 |
* | | Forgot to check in railties fixture for binstubs | Yehuda Katz | 2012-12-22 | 1 | -0/+0 |
* | | Add --no-html to scaffold generator | Yehuda Katz | 2012-12-22 | 5 | -8/+54 |
* | | Detect rbenv and update the shebang | Yehuda Katz | 2012-12-22 | 2 | -1/+18 |
* | | Install binstubs by default | Yehuda Katz | 2012-12-22 | 2 | -4/+4 |
* | | Merge pull request #8085 from acapilleri/format_never_nil | Guillermo Iguaran | 2012-12-22 | 4 | -3/+28 |
|\ \ |
|
| * | | return Mime::NullType if format is unknown | Angelo Capilleri | 2012-12-22 | 4 | -3/+28 |
| |/ |
|
* | | Merge pull request #8586 from balexand/cache_digests_regex | Rafael Mendonça França | 2012-12-21 | 3 | -2/+12 |
|\ \
| |/
|/| |
|
| * | Digestor explicit dependency should not contain trailing whitespace | Brian Alexander | 2012-12-21 | 3 | -2/+12 |
* | | Move background jobs to the 'jobs' branch until fully baked. Not shipping wit... | Jeremy Kemper | 2012-12-21 | 25 | -724/+4 |
* | | Merge pull request #8471 from kytrinyx/refactor-xml-to-hash | Steve Klabnik | 2012-12-21 | 2 | -51/+101 |
|\ \ |
|
| * | | Refactor Hash.from_xml. | Steve Klabnik + Katrina Owen | 2012-12-21 | 2 | -51/+101 |
* | | | Merge pull request #8574 from alindeman/rails_env | Rafael Mendonça França | 2012-12-21 | 4 | -7/+14 |
|\ \ \ |
|
| * | | | Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is not set (... | Andy Lindeman | 2012-12-21 | 2 | -1/+13 |
| * | | | Revert "Make sure that RAILS_ENV is set when accessing Rails.env" | Andy Lindeman | 2012-12-21 | 2 | -6/+1 |
* | | | | Merge pull request #7312 from krainboltgreene/http-token-parser-bug | Steve Klabnik | 2012-12-21 | 2 | -17/+56 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Refactoring the token_and_options method to fix bugs | Kurtis Rainbolt-Greene | 2012-12-15 | 2 | -17/+56 |
* | | | | Remove duplicated methods in command recorder and duplicated test name | Carlos Antonio da Silva | 2012-12-21 | 2 | -4/+4 |
* | | | | Fix calling quote column name in interpolated string | Carlos Antonio da Silva | 2012-12-21 | 1 | -1/+1 |
* | | | | Merge pull request #8267 from marcandre/reversible_drop_table_etc | Aaron Patterson | 2012-12-21 | 15 | -307/+841 |
|\ \ \ \ |
|
| * | | | | Update Migration and 4.0 Release Guides, Changelogs [#8267] | Marc-Andre Lafortune | 2012-12-21 | 4 | -36/+223 |
| * | | | | Make execute, change_column and remove_columns methods actually irreversible | Marc-Andre Lafortune | 2012-12-21 | 2 | -2/+9 |
| * | | | | Make change_table reversible when possible [#8267] | Marc-Andre Lafortune | 2012-12-21 | 2 | -1/+25 |
| * | | | | Migration generators use `change` even for destructive methods [#8267] | Marc-Andre Lafortune | 2012-12-21 | 2 | -47/+16 |