aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Favor canonical environment variables for secretsschneems2014-01-132-3/+3
* Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665.Yves Senn2014-01-133-2/+26
* Merge pull request #13699 from rystraum/dependent-restrict-removalRafael Mendonça França2014-01-131-0/+4
|\
| * Updated Changelog to reflect removal of :dependent => :restrictRystraum Gamonez2014-01-141-0/+4
|/
* Merge pull request #13693 from gaurish/typoYves Senn2014-01-137-6/+39
|\
| * standardize on jruby_skip & rbx_skipGaurish Sharma2014-01-137-6/+39
* | fix bug in becomes! when changing from base to subclass. Closes #13272.Yves Senn2014-01-133-1/+22
|/
* highlight http://localhost:3000 in README.md. Closes #13643. [ci skip]Yves Senn2014-01-131-1/+2
* doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip]Yves Senn2014-01-131-1/+2
* Merge pull request #13687 from gaurish/spring-has-no-love-for-jrubyYves Senn2014-01-121-0/+2
|\
| * Skip Spring App Generator tests on JRubyGaurish Sharma2014-01-131-0/+2
* | Merge pull request #13646 from jenseng/json_escapeGodfrey Chan2014-01-121-12/+12
|\ \
| * | Clarify behavior of json_escape, update examplesJon Jensen2014-01-091-12/+12
* | | Merge pull request #13673 from senny/use_enum_label_in_formsDavid Heinemeier Hansson2014-01-122-0/+7
|\ \ \ | |_|/ |/| |
| * | use enum labels as form values. Achieved by `_before_type_cast`.Yves Senn2014-01-112-0/+7
* | | fixes a typo in a CHANGELOGXavier Noria2014-01-121-1/+1
* | | upgrade SDocXavier Noria2014-01-126-12/+14
* | | fixes the Gemfile generator templatesXavier Noria2014-01-122-8/+4
* | | Merge pull request #13668 from prathamesh-sonpatki/issue-13667Andrew White2014-01-122-2/+5
|\ \ \
| * | | Fix iterating over DateTime by doing strict checking for Time objectsPrathamesh Sonpatki2014-01-112-2/+5
* | | | Merge pull request #13671 from arunagw/upgrade-bundlerAndrew White2014-01-111-13/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Removing without_thor_debugArun Agrawal2014-01-111-13/+3
|/ / /
* | | Merge branch 'master' into laurocaetano-fix_send_fileAaron Patterson2014-01-10494-3334/+9555
|\ \ \
| * \ \ Merge branch 'ruby-2.2'Aaron Patterson2014-01-102-1/+6
| |\ \ \
| | * \ \ Merge branch 'master' into ruby-2.2Aaron Patterson2014-01-092-17/+11
| | |\ \ \
| | * | | | Check `respond_to` before delegation due to: https://github.com/ruby/ruby/com...Aaron Patterson2014-01-092-1/+6
| * | | | | doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]Yves Senn2014-01-101-0/+1
| * | | | | Merge pull request #13657 from leriksen/masterYves Senn2014-01-091-2/+0
| |\ \ \ \ \
| | * | | | | [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce ...leriksen2014-01-101-2/+0
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #13659 from prathamesh-sonpatki/fix-buildGuillermo Iguaran2014-01-091-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Restore DATABASE_URL even if it's nil in connection_handler testPrathamesh Sonpatki2014-01-101-1/+1
| |/ / /
| * | | Merge pull request #13582 from schneems/schneems/preserve-connection-behaviorRafael Mendonça França2014-01-0911-33/+409
| |\ \ \ | | |_|/ | |/| |
| | * | Ensure Active Record connection consistencyschneems2014-01-0911-33/+409
| * | | Revert "ask the fixture set for the sql statements"Aaron Patterson2014-01-092-17/+11
| | |/ | |/|
| * | Merge pull request #13632 from tinogomes/masterRafael Mendonça França2014-01-095-0/+63
| |\ \ | | |/ | |/|
| | * Adding Hash#compact and Hash#compact! methodstinogomes2014-01-095-0/+63
| * | Merge pull request #13644 from zzak/doc_mysql_config_templateGuillermo Iguaran2014-01-081-1/+1
| |\ \
| | * | MySQL version 4.1 was EOL on December 31, 2009Zachary Scott2014-01-081-1/+1
| |/ /
| * | clear cache on body close so that cache remains during renderingAaron Patterson2014-01-082-2/+45
| * | add a more restricted codepath for templates fixes #13390Aaron Patterson2014-01-082-12/+51
| * | Merge pull request #13637 from craftsmen/app-generator-minor-fixRafael Mendonça França2014-01-081-4/+4
| |\ \
| | * | Move finish_template as the last public method in the generatorMehdi Lahmam2014-01-081-4/+4
| | |/
| * | refactor generator tests to use block form of TempfileAaron Patterson2014-01-081-36/+30
| * | Merge pull request #13634 from jwworth/masterCarlos Antonio da Silva2014-01-081-1/+1
| |\ \ | | |/ | |/|
| | * Fix typo [ci skip]Jake Worth2014-01-081-1/+1
| |/
| * Minor typos fix [ci skip]Robin Dupret2014-01-081-3/+3
| * make `change_column_null` reversible. Closes #13576.Yves Senn2014-01-083-1/+26
| * Merge pull request #13629 from dmathieu/drop_testYves Senn2014-01-085-5/+40
| |\
| | * create/drop test and development databases only if RAILS_ENV is nilDamien Mathieu2014-01-085-5/+40
| |/
| * Revert "Speedup String#to"Yves Senn2014-01-082-3/+1