Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Don't try to get the subclass if the inheritance column doesn't exist | Ujjwal Thaakar | 2014-01-14 | 5 | -8/+42 | |
|/ / / / | ||||||
* | | | | Enum mappings are now exposed via class methods instead of constants. | Godfrey Chan | 2014-01-14 | 3 | -10/+31 | |
* | | | | Merge pull request #13705 from mess110/controller_generator_route_quotes | Carlos Antonio da Silva | 2014-01-14 | 5 | -11/+15 | |
|\ \ \ \ | ||||||
| * | | | | single quotes for controller generated routes | Cristian Mircea Messel | 2014-01-14 | 5 | -11/+15 | |
* | | | | | Merge pull request #13706 from prathamesh-sonpatki/issue-13125 | Yves Senn | 2014-01-14 | 1 | -3/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix fields_for documentation with index option [ci skip] | Prathamesh Sonpatki | 2014-01-14 | 1 | -3/+10 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #13709 from akshay-vishnoi/typo | Yves Senn | 2014-01-14 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | [ci skip] Grammar correction | Akshay Vishnoi | 2014-01-14 | 1 | -1/+1 | |
* | | | | | | quick pass through Active Record CHANGELOG. [ci skip] | Yves Senn | 2014-01-14 | 1 | -7/+9 | |
* | | | | | | Merge pull request #13669 from chulkilee/name-error-name | Yves Senn | 2014-01-14 | 3 | -2/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Set NameError#name | Chulki Lee | 2014-01-13 | 3 | -2/+8 | |
* | | | | | | | Merge pull request #13707 from udaykadaboina/docModification | Damien Mathieu | 2014-01-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | [ci skip] Added alias to CSRF | Uday Kadaboina | 2014-01-14 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | unscope should remove bind values associated with the where | Aaron Patterson | 2014-01-13 | 2 | -0/+11 | |
* | | | | | | reverse_order_value= is not private, so no need to send | Aaron Patterson | 2014-01-13 | 1 | -1/+1 | |
* | | | | | | avoid more dynamic symbols | Aaron Patterson | 2014-01-13 | 1 | -1/+1 | |
* | | | | | | no need to to_sym | Aaron Patterson | 2014-01-13 | 1 | -2/+2 | |
* | | | | | | Merge pull request #13704 from waynn/patch-4 | Rafael Mendonça França | 2014-01-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | "serie" => "series" | Waynn Lue | 2014-01-13 | 1 | -2/+2 | |
* | | | | | | | recover from test runs that leave the database in a bad state | Aaron Patterson | 2014-01-13 | 1 | -1/+1 | |
* | | | | | | | updates screenshot data [ci skip] | Xavier Noria | 2014-01-13 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* / / / / / | revises a few things in the getting started guide [ci skip] | Xavier Noria | 2014-01-13 | 5 | -121/+129 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13703 from schneems/schneems/rail-secrets-key | Rafael Mendonça França | 2014-01-13 | 2 | -3/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Favor canonical environment variables for secrets | schneems | 2014-01-13 | 2 | -3/+3 | |
* | | | | | | Merge pull request #13702 from kuldeepaggarwal/docs-fix | Rafael Mendonça França | 2014-01-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | removed extra comma [ci skip] | Kuldeep Aggarwal | 2014-01-14 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665. | Yves Senn | 2014-01-13 | 3 | -2/+26 | |
* | | | | | Merge pull request #13699 from rystraum/dependent-restrict-removal | Rafael Mendonça França | 2014-01-13 | 1 | -0/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Updated Changelog to reflect removal of :dependent => :restrict | Rystraum Gamonez | 2014-01-14 | 1 | -0/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13693 from gaurish/typo | Yves Senn | 2014-01-13 | 7 | -6/+39 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | standardize on jruby_skip & rbx_skip | Gaurish Sharma | 2014-01-13 | 7 | -6/+39 | |
* | | | | | fix bug in becomes! when changing from base to subclass. Closes #13272. | Yves Senn | 2014-01-13 | 3 | -1/+22 | |
|/ / / / | ||||||
* | | | | highlight http://localhost:3000 in README.md. Closes #13643. [ci skip] | Yves Senn | 2014-01-13 | 1 | -1/+2 | |
* | | | | doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip] | Yves Senn | 2014-01-13 | 1 | -1/+2 | |
* | | | | Merge pull request #13687 from gaurish/spring-has-no-love-for-jruby | Yves Senn | 2014-01-12 | 1 | -0/+2 | |
|\ \ \ \ | ||||||
| * | | | | Skip Spring App Generator tests on JRuby | Gaurish Sharma | 2014-01-13 | 1 | -0/+2 | |
* | | | | | Merge pull request #13646 from jenseng/json_escape | Godfrey Chan | 2014-01-12 | 1 | -12/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | Clarify behavior of json_escape, update examples | Jon Jensen | 2014-01-09 | 1 | -12/+12 | |
* | | | | | | Merge pull request #13673 from senny/use_enum_label_in_forms | David Heinemeier Hansson | 2014-01-12 | 2 | -0/+7 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | use enum labels as form values. Achieved by `_before_type_cast`. | Yves Senn | 2014-01-11 | 2 | -0/+7 | |
* | | | | | | fixes a typo in a CHANGELOG | Xavier Noria | 2014-01-12 | 1 | -1/+1 | |
* | | | | | | upgrade SDoc | Xavier Noria | 2014-01-12 | 6 | -12/+14 | |
* | | | | | | fixes the Gemfile generator templates | Xavier Noria | 2014-01-12 | 2 | -8/+4 | |
* | | | | | | Merge pull request #13668 from prathamesh-sonpatki/issue-13667 | Andrew White | 2014-01-12 | 2 | -2/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix iterating over DateTime by doing strict checking for Time objects | Prathamesh Sonpatki | 2014-01-11 | 2 | -2/+5 | |
* | | | | | | | Merge pull request #13671 from arunagw/upgrade-bundler | Andrew White | 2014-01-11 | 1 | -13/+3 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Removing without_thor_debug | Arun Agrawal | 2014-01-11 | 1 | -13/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'master' into laurocaetano-fix_send_file | Aaron Patterson | 2014-01-10 | 494 | -3334/+9555 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'ruby-2.2' | Aaron Patterson | 2014-01-10 | 2 | -1/+6 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into ruby-2.2 | Aaron Patterson | 2014-01-09 | 2 | -17/+11 | |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | |