aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #13669 from chulkilee/name-error-nameYves Senn2014-01-143-2/+8
|\ \ \ \
| * | | | Set NameError#nameChulki Lee2014-01-133-2/+8
* | | | | Merge pull request #13707 from udaykadaboina/docModificationDamien Mathieu2014-01-131-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ci skip] Added alias to CSRFUday Kadaboina2014-01-141-2/+2
|/ / / /
* | | | unscope should remove bind values associated with the whereAaron Patterson2014-01-132-0/+11
* | | | reverse_order_value= is not private, so no need to sendAaron Patterson2014-01-131-1/+1
* | | | avoid more dynamic symbolsAaron Patterson2014-01-131-1/+1
* | | | no need to to_symAaron Patterson2014-01-131-2/+2
* | | | Merge pull request #13704 from waynn/patch-4Rafael Mendonça França2014-01-131-2/+2
|\ \ \ \
| * | | | "serie" => "series"Waynn Lue2014-01-131-2/+2
* | | | | recover from test runs that leave the database in a bad stateAaron Patterson2014-01-131-1/+1
* | | | | updates screenshot data [ci skip]Xavier Noria2014-01-131-1/+1
|/ / / /
* / / / revises a few things in the getting started guide [ci skip]Xavier Noria2014-01-135-121/+129
|/ / /
* | | Merge pull request #13703 from schneems/schneems/rail-secrets-keyRafael Mendonça França2014-01-132-3/+3
|\ \ \
| * | | Favor canonical environment variables for secretsschneems2014-01-132-3/+3
* | | | Merge pull request #13702 from kuldeepaggarwal/docs-fixRafael Mendonça França2014-01-131-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | removed extra comma [ci skip]Kuldeep Aggarwal2014-01-141-1/+1
|/ / /
* | | 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
| | |/ / | |/| |