Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge pull request #26050 from bogdanvlviv/optimistic_locking | Aaron Patterson | 2016-10-21 | 5 | -20/+157 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Added ability update locking_column value | bogdanvlviv | 2016-10-21 | 4 | -7/+90 | |
| * | | | | | | | | | | Fixed: Optimistic locking does not work well with null in the database | bogdanvlviv | 2016-10-21 | 4 | -15/+69 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #26855 from headius/explicit_order_callback_args | Aaron Patterson | 2016-10-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Additional fix for argument-splat ordering differences. | Charles Oliver Nutter | 2016-10-21 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge pull request #26854 from headius/explicit_order_callback_args | Aaron Patterson | 2016-10-21 | 1 | -4/+4 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Explicitly unpack the expanded args to avoid execution order diff. | Charles Oliver Nutter | 2016-10-21 | 1 | -4/+4 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #26853 from zegomesjf/feature/skip_active_record | Guillermo Iguaran | 2016-10-21 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | don't create db directory when skip active_record | José Gomes Júnior | 2016-10-21 | 2 | -0/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #26839 from renuo/fix-missing-nsec-transfer | Andrew White | 2016-10-21 | 3 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix copy_time_to: Copy nsec instead of usec | Josua Schmid | 2016-10-20 | 3 | -2/+10 | |
| |/ / / / / / / | ||||||
* | | | | | | | | doc, hide non-public methods form the api docs. [ci skip] | Yves Senn | 2016-10-20 | 1 | -2/+2 | |
* | | | | | | | | guides, include note about modifiers when using the CLI. | Yves Senn | 2016-10-20 | 1 | -0/+2 | |
* | | | | | | | | remove trailing whitespace [ci skip] | Yves Senn | 2016-10-20 | 1 | -8/+8 | |
* | | | | | | | | Merge pull request #26846 from brunofacca/patch-1 | Rafael França | 2016-10-20 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [ci skip] Fix return values of Hash Extensions examples | Bruno Facca | 2016-10-20 | 1 | -4/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2016-10-20 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Corrected comments referring to documentation in | Iain Beeston | 2016-10-03 | 1 | -3/+3 | |
| * | | | | | | | | Corrected comments referring to ActiveModel::Attributes | Iain Beeston | 2016-10-03 | 1 | -1/+1 | |
* | | | | | | | | | Use old typecasting method if no type casted binds are passed in | Aaron Patterson | 2016-10-20 | 2 | -2/+45 | |
* | | | | | | | | | Merge pull request #26830 from headius/mask_forking_fsevent_test_on_jruby | Rafael Mendonça França | 2016-10-20 | 1 | -0/+2 | |
* | | | | | | | | | render_bind should be private | Aaron Patterson | 2016-10-19 | 1 | -10/+10 | |
* | | | | | | | | | Merge pull request #26829 from headius/wait_for_events_in_listen_tests | Aaron Patterson | 2016-10-19 | 1 | -0/+18 | |
* | | | | | | | | | Merge pull request #26825 from orhantoy/fix-doc-code-indentation | Jon Moss | 2016-10-19 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix indentation of code examples | Orhan Toy | 2016-10-19 | 1 | -4/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #26821 from y-yagi/update_doc_about_change_column_default | प्रथमेश Sonpatki | 2016-10-19 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | update doc about `change_column_default` [ci skip] | yuuji.yaginuma | 2016-10-19 | 1 | -2/+4 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #26809 from alexcameron89/contributing_guide_typo | Jon Moss | 2016-10-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Fix typo in Guides: Contributing | Alex Kitchens | 2016-10-17 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | /s/integrations/integration [ci skip] (#26801) | प्रथमेश Sonpatki | 2016-10-16 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #26800 from prathamesh-sonpatki/bump-bundler | Guillermo Iguaran | 2016-10-16 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Bump bundler version in the before_install hook of travis | Prathamesh Sonpatki | 2016-10-16 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #26786 from codeodor/patch-1 | Eileen M. Uchitelle | 2016-10-15 | 3 | -1/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Allow any key in Renderer environment hash | Sammy Larbi | 2016-10-15 | 3 | -1/+16 | |
* | | | | | | | | Copy-edit the documentation | Rafael Mendonça França | 2016-10-15 | 1 | -4/+4 | |
* | | | | | | | | Merge pull request #26793 from zachaysan/master | Rafael França | 2016-10-15 | 1 | -98/+100 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Make `process` a non-private method and update documentation. | Zach Aysan | 2016-10-15 | 1 | -98/+100 | |
* | | | | | | | | | Merge pull request #26598 from rutaka-n/raise_record_not_found_with_correct_p... | Eileen M. Uchitelle | 2016-10-15 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | initialize errors with name of class and other params | v.promzelev | 2016-09-23 | 1 | -2/+2 | |
* | | | | | | | | | | Pull request for ticket 26769 (#26770) | rmarone | 2016-10-15 | 1 | -1/+1 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #26792 from rails/benchmark-template | Godfrey Chan | 2016-10-15 | 2 | -27/+67 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Introduce a benchmark template [ci skip] | Godfrey Chan | 2016-10-15 | 2 | -27/+67 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #26784 from kamipo/quote_table_name_properly | Rafael França | 2016-10-14 | 5 | -24/+35 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Quote table name properly | Ryuta Kamizono | 2016-10-14 | 5 | -24/+35 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Add comment to remove code when we are in Ruby 2.4 | Rafael Mendonça França | 2016-10-14 | 1 | -0/+1 | |
* | | | | | | | | | Merge pull request #26785 from yahonda/diag26774 | Rafael França | 2016-10-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Support index.length for MySQL 8.0.0-dmr | Yasuo Honda | 2016-10-13 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #26788 from Jesus/master | Rafael França | 2016-10-14 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Use built-in #transform_values when available. | Jesús Burgos | 2016-10-14 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #26787 from y-yagi/add_missing_closing_tag | Jon Moss | 2016-10-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | |