| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | Revert "The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now." | Santiago Pastorino | 2012-10-30 | 1 | -1/+1 |
* | | | | Merge pull request #8072 from kennyj/remove_mattr_include_root_in_json | Carlos Antonio da Silva | 2012-10-30 | 2 | -1/+16 |
|\ \ \ \ |
|
| * | | | | include_root_in_json allows inheritance. | kennyj | 2012-10-31 | 2 | -1/+16 |
* | | | | | Merge pull request #6107 from gazay/make_caller_attribute_in_deprecation_opti... | Carlos Antonio da Silva | 2012-10-30 | 37 | -56/+59 |
|\| | | | |
|
| * | | | | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 37 | -56/+59 |
|/ / / / |
|
* | | | | Remove not assigned variable warning from sqlite3 adapter test | Carlos Antonio da Silva | 2012-10-29 | 1 | -1/+1 |
* | | | | Fix bug when Column is trying to type cast boolean values to integer. | Rafael Mendonça França | 2012-10-29 | 2 | -6/+17 |
* | | | | Merge pull request #8066 from cfabianski/AddTestForSerializationMethod | Carlos Antonio da Silva | 2012-10-29 | 1 | -0/+9 |
|\ \ \ \ |
|
| * | | | | Add test for code change introduced in this commit f20032f | Cédric FABIANSKI | 2012-10-29 | 1 | -0/+9 |
|/ / / / |
|
* | | | | Fix failing tests and use new hash style in deprecation messages | Carlos Antonio da Silva | 2012-10-29 | 6 | -28/+28 |
* | | | | Merge pull request #8063 from nikitug/deprecation_caller_context | Carlos Antonio da Silva | 2012-10-29 | 27 | -55/+88 |
|\ \ \ \ |
|
| * | | | | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 27 | -55/+88 |
* | | | | | Fix deprecation message in test for Path#children | Carlos Antonio da Silva | 2012-10-29 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Add test to deprecation of Path#children | Rafael Mendonça França | 2012-10-29 | 1 | -0/+6 |
* | | | | Merge pull request #7587 from elia/fix-too-eager-loading | Rafael Mendonça França | 2012-10-29 | 3 | -6/+17 |
* | | | | Merge pull request #8027 from daenney/master | Xavier Noria | 2012-10-29 | 3 | -3/+12 |
|\ \ \ \ |
|
| * | | | | atomicc.rb: Don't assume we may chown/chmod a file. | Daniele Sluijters | 2012-10-29 | 3 | -3/+12 |
|/ / / / |
|
* | | | | Fix the skip code. | Rafael Mendonça França | 2012-10-28 | 1 | -4/+4 |
* | | | | Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg | Rafael Mendonça França | 2012-10-28 | 2 | -1/+7 |
|\ \ \ \ |
|
| * | | | | SQLite3Adapter#type_cast should not mutate arguments | Stefan Rusterholz | 2012-10-28 | 2 | -1/+7 |
|/ / / / |
|
* | | | | Merge pull request #7750 from xuanxu/none_modificating_relation_in_place | Rafael Mendonça França | 2012-10-28 | 4 | -0/+25 |
|\ \ \ \ |
|
| * | | | | ActiveRecord::Relation#none! method. | Juanjo Bazán | 2012-10-28 | 3 | -0/+16 |
| * | | | | loaded relations cannot be mutated by extending! | Juanjo Bazán | 2012-10-28 | 1 | -0/+9 |
|/ / / / |
|
* | | | | Merge pull request #8053 from henrik/update_columns_with_primary_key | Carlos Antonio da Silva | 2012-10-28 | 3 | -1/+20 |
|\ \ \ \ |
|
| * | | | | Enable update_column(s) for the primary key attribute. | Henrik N | 2012-10-28 | 3 | -1/+20 |
|/ / / / |
|
* | | | | Merge pull request #8046 from pmahoney/exceptions_as_flow_control | Rafael Mendonça França | 2012-10-28 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | Replace flow-control exception with explicit test. | Patrick Mahoney | 2012-10-27 | 1 | -2/+2 |
* | | | | | Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call | Rafael Mendonça França | 2012-10-28 | 5 | -1/+28 |
|\ \ \ \ \ |
|
| * | | | | | Do not render views when mail() isn't called. (NullMail refactoring) | Yves Senn | 2012-10-28 | 5 | -1/+28 |
| |/ / / / |
|
* | | | | | Merge pull request #8047 from arunagw/json_only_in_18 | Carlos Antonio da Silva | 2012-10-28 | 1 | -1/+0 |
* | | | | | Fix some assert_raise calls containing messages in Active Support | Carlos Antonio da Silva | 2012-10-28 | 2 | -7/+15 |
* | | | | | Merge pull request #8054 from senny/6378_create_table_raises_when_defining_pk... | Carlos Antonio da Silva | 2012-10-28 | 5 | -6/+45 |
|\ \ \ \ \ |
|
| * | | | | | raise `ArgumentError` when redefining the primary key column. Closes #6378 | Yves Senn | 2012-10-28 | 3 | -0/+34 |
| * | | | | | refactor `SQLite3Adapter#copy_table` to prevent primary key redefinitions. #6378 | Yves Senn | 2012-10-28 | 2 | -6/+11 |
|/ / / / / |
|
* | | | | | Merge pull request #8056 from frodsan/fix_issue_missing_attribute | Rafael Mendonça França | 2012-10-28 | 3 | -3/+38 |
|\ \ \ \ \ |
|
| * | | | | | AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes. | Francesco Rodriguez | 2012-10-28 | 3 | -3/+38 |
|/ / / / / |
|
* | | | | | Merge pull request #8052 from schneems/schneems/silence-ar-query-in-middleware | Rafael Mendonça França | 2012-10-28 | 1 | -1/+3 |
|\ \ \ \ \ |
|
| * | | | | | Don't log on pending migration check | schneems | 2012-10-28 | 1 | -1/+3 |
|/ / / / / |
|
* | | | | | Add syntax highlight to code blocks in javascript guide [ci skip] | Carlos Antonio da Silva | 2012-10-28 | 1 | -27/+25 |
* | | | | | Add backticks around link_to example in javascript guide [ci skip] | Carlos Antonio da Silva | 2012-10-28 | 2 | -1/+3 |
* | | | | | Merge pull request #8050 from bashmish/master | Carlos Antonio da Silva | 2012-10-28 | 1 | -0/+1 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | fix typo in button_to helper example | Michael Bashkirov | 2012-10-28 | 1 | -0/+1 |
|/ / / / |
|
* | | | | USe the released version of sprockets-rails in a new Rails 4 application | Rafael Mendonça França | 2012-10-27 | 1 | -1/+1 |
* | | | | Merge pull request #7960 from pwnall/mysql_varbinary | Rafael Mendonça França | 2012-10-27 | 7 | -18/+71 |
|\ \ \ \ |
|
| * | | | | Use the MySQL varbinary type when appropriate in migrations. | Victor Costan | 2012-10-27 | 7 | -18/+71 |
* | | | | | Improve the deprecation message of link_to_function and | Rafael Mendonça França | 2012-10-27 | 2 | -8/+10 |
|/ / / / |
|
* | | | | Merge pull request #8034 from gbchaosmaster/readme-format | Xavier Noria | 2012-10-27 | 2 | -19/+18 |
|\ \ \ \ |
|
| * | | | | Organize README | Vinny Diehl | 2012-10-26 | 2 | -19/+18 |
* | | | | | Add the Working with JavaScript Guides in the guides home as WIP | Rafael Mendonça França | 2012-10-27 | 1 | -29/+34 |
* | | | | | Merge pull request #8043 from senny/remove_trailing_whitespace_in_actionpack | Rafael Mendonça França | 2012-10-27 | 11 | -17/+17 |
|\ \ \ \ \ |
|