aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8598 from NARKOZ/refactor-highlightSantiago Pastorino2012-12-261-2/+2
|\
| * fetch highlighter option only when neededNihad Abbasov2012-12-241-2/+2
* | Revert the change at ActiveModel::Errors#add_on_blank and fix in theRafael Mendonça França2012-12-263-14/+8
* | Tests and fix for validates_presence of :allow_nil, :allow_blankColin Kelley2012-12-262-1/+41
* | Note about migration timestamps.Steve Klabnik2012-12-261-1/+3
* | Consistent use of single and double quotesRafael Mendonça França2012-12-261-10/+10
* | Merge pull request #8616 from senny/8612_respect_yaml_keywordsRafael Mendonça França2012-12-264-7/+48
|\ \
| * | quote column names in generated fixture filesYves Senn2012-12-264-7/+48
* | | Fix CHANGELOG style [ci skip]Rafael Mendonça França2012-12-262-6/+6
* | | Merge pull request #5100 from paukul/validate_on_condition_on_transaction_cal...Rafael Mendonça França2012-12-263-6/+29
|\ \ \
| * | | validate :on option on after_commit and after_rollback callbacksPascal Friederich2012-12-263-6/+29
* | | | We need to check explictly that env['action_dispatch.show_exceptions']Rafael Mendonça França2012-12-261-1/+1
* | | | Merge pull request #8600 from shime/patch-1Rafael Mendonça França2012-12-261-4/+3
|\ \ \ \
| * | | | more descriptive return parametersHrvoje Šimić2012-12-261-4/+3
* | | | | Revert "Ignore /bin on new apps" -- given the move to default binstubs, we wa...David Heinemeier Hansson2012-12-261-4/+3
| |/ / / |/| | |
* | | | Merge pull request #8608 from senny/8576_cant_inherit_from_deprecated_buffere...Rafael Mendonça França2012-12-252-1/+19
|\ \ \ \
| * | | | deprecation warning when BufferedLogger is instantiatedYves Senn2012-12-252-1/+19
| | |/ / | |/| |
* | | | Merge pull request #8609 from senny/buffered_logger_documentationGuillermo Iguaran2012-12-253-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | replace AS::BufferedLogger doc mentions with AS::LoggerYves Senn2012-12-253-5/+5
|/ / /
* | | Merge pull request #8607 from senny/8576_cant_inherit_from_deprecated_buffere...Rafael Mendonça França2012-12-252-2/+20
|\ \ \
| * | | ActiveSupport::BufferedLogger can be subclassedYves Senn2012-12-252-2/+20
|/ / /
* | | Merge pull request #8592 from rafaelfranca/warning_fixGuillermo Iguaran2012-12-241-1/+5
|\ \ \
| * | | Remove warning of intance variable not initializedRafael Mendonça França2012-12-231-1/+5
* | | | Merge pull request #8604 from zoltankiss/minor_fixesGuillermo Iguaran2012-12-241-1/+1
|\ \ \ \
| * | | | minor grammar fixZoltan Kiss2012-12-241-1/+1
|/ / / /
* | | / silences "possibly useless use of :: in void context" warningsXavier Noria2012-12-241-7/+3
| |_|/ |/| |
* | | Merge pull request #8601 from amatsuda/chmod_xRafael Mendonça França2012-12-242-0/+0
|\ \ \ | |_|/ |/| |
| * | chmod -x from non-script filesAkira Matsuda2012-12-242-0/+0
|/ /
* | Merge pull request #8595 from amatsuda/regex_warningRafael Mendonça França2012-12-231-1/+1
|\ \
| * | "warning: ambiguous first argument; put parentheses or even spaces"Akira Matsuda2012-12-241-1/+1
|/ /
* | Merge pull request #8594 from amatsuda/rm_sqlite2Guillermo Iguaran2012-12-231-13/+5
|\ \
| * | we're not supporting SQLite 2Akira Matsuda2012-12-241-13/+5
| |/
* | Explicit options should have precedence over railsrc on the `rails new`Rafael Mendonça França2012-12-242-2/+5
* | Merge pull request #8593 from shime/masterRafael Mendonça França2012-12-231-2/+0
|\ \ | |/ |/|
| * remove duplication from Rails::Application docsHrvoje Šimić2012-12-241-2/+0
|/
* Merge pull request #8588 from marcandre/fix_reversibleCarlos Antonio da Silva2012-12-235-9/+24
|\
| * Fixes for PR [#8267]Marc-Andre Lafortune2012-12-225-9/+24
* | Fix spacing regression in scaffold generatorYehuda Katz2012-12-221-1/+3
* | Fix syntax error in controller templateGuillermo Iguaran2012-12-221-4/+12
* | adds kindlerb to the :doc bundle group for guides generationXavier Noria2012-12-221-0/+1
* | Ignore /bin on new appsJosé Valim2012-12-221-3/+4
* | Forgot to check in railties fixture for binstubsYehuda Katz2012-12-221-0/+0
* | Add --no-html to scaffold generatorYehuda Katz2012-12-225-8/+54
* | Detect rbenv and update the shebangYehuda Katz2012-12-222-1/+18
* | Install binstubs by defaultYehuda Katz2012-12-222-4/+4
* | Merge pull request #8085 from acapilleri/format_never_nilGuillermo Iguaran2012-12-224-3/+28
|\ \
| * | return Mime::NullType if format is unknownAngelo Capilleri2012-12-224-3/+28
| |/
* | Merge pull request #8586 from balexand/cache_digests_regexRafael Mendonça França2012-12-213-2/+12
|\ \ | |/ |/|
| * Digestor explicit dependency should not contain trailing whitespaceBrian Alexander2012-12-213-2/+12
* | Move background jobs to the 'jobs' branch until fully baked. Not shipping wit...Jeremy Kemper2012-12-2125-724/+4