Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17545 from marzapower/dirty_public_api | Rafael Mendonça França | 2014-11-06 | 1 | -1/+1 |
|\ | | | | | [Enh] Made the ActiveModel::Dirty#clear_attribute_changes method public | ||||
| * | [Enh] Changed the visibility of the ↵ | Daniele Di Bernardo | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | ActiveModel::Dirty#clear_attribute_changes method In Rails 4.2 it is impossible to define a custom default value for a model's attribute without making it appear as _changed?, especially when the model is first initialized. Making this method publicly visible will allow such a behaviour, without the need to use private APIs. | ||||
* | | Merge pull request #17543 from rishijain/update_docs_9 | Rafael Mendonça França | 2014-11-06 | 2 | -5/+11 |
|\ \ | |/ |/| | added example of hash#except, and removed extra whitespaces [ci skip] | ||||
| * | added example of hash#except, and removed extra whitespaces [ci skip] | Rishi Jain | 2014-11-07 | 2 | -5/+11 |
|/ | |||||
* | tests, remove unneeded requires. | Yves Senn | 2014-11-06 | 4 | -11/+0 |
| | |||||
* | tests, use SchemaDumpingHelper to dump a specific table. | Yves Senn | 2014-11-06 | 1 | -12/+12 |
| | | | | | This makes debugging the generated schema output much easier. As a side effect it also shaves off 2.5 seconds of test runtime. | ||||
* | Merge pull request #17523 from tgxworld/reset_session_after_calling_with_routing | Rafael Mendonça França | 2014-11-06 | 3 | -0/+41 |
|\ | | | | | Remove session to allow `with_routing` to be called twice. | ||||
| * | Remove session to allow `with_routing` to be called twice. | Guo Xiang Tan | 2014-11-05 | 3 | -0/+41 |
| | | | | | | | | Fixes: https://github.com/rails/rails/issues/16814 | ||||
* | | Merge pull request #17536 from vipulnsward/fix-group-expression-warning | Rafael Mendonça França | 2014-11-06 | 1 | -2/+2 |
|\ \ | | | | | | | Fixed grouped expression warning | ||||
| * | | Fix grouped expression warning - `warning: (...) interpreted as grouped ↵ | Vipul A M | 2014-11-06 | 1 | -2/+2 |
|/ / | | | | | | | expression` | ||||
* | | Merge pull request #17526 from rishijain/update_docs_6 | Vijay Dev | 2014-11-06 | 2 | -0/+15 |
|\ \ | | | | | | | Update docs 6 | ||||
| * | | added example of squish!, remove, test case for multiple occurrence of | Rishi Jain | 2014-11-06 | 2 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | pattern removal added example for string#remove and test case for remove of multiple occurence of pattern removed extra whitespaces | ||||
* | | | docs, synchronize 4.2. release notes. [ci skip] | Yves Senn | 2014-11-06 | 2 | -7/+14 |
| | | | | | | | | | | | | /cc @chancancode | ||||
* | | | Merge pull request #17529 from slothbear/patch-1 | Yves Senn | 2014-11-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove redundancy [ci skip] | ||||
| * | | | Remove redundancy | Paul Morganthall | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | I love this guide! and "visually see" is redundant. remove "visually", then the sentence reads: > Action Mailer previews provide a way to see how emails look | ||||
* | | | | Merge pull request #17530 from prathamesh-sonpatki/fix-html | Yves Senn | 2014-11-06 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Replace Html with HTML [ci skip] | ||||
| * | | | Replace Html with HTML [ci skip] | Prathamesh Sonpatki | 2014-11-06 | 1 | -2/+2 |
|/ / / | | | | | | | | | | - Everywhere else we using HTML Sanitizer except this place. | ||||
* | | | Merge pull request #17528 from revans/respond_with_doc | Guillermo Iguaran | 2014-11-06 | 2 | -18/+5 |
|\ \ \ | |/ / |/| | | [docs] Removed respond_with documentation as it was deprecated and removed from Rails [ci-skip] | ||||
| * | | Removed documentation that still mentioned using respond_with in place | Robert Evans | 2014-11-05 | 2 | -18/+5 |
|/ / | | | | | | | | | of respond_to. respond_with was moved into the responders gem and deprecated inside rails, so there is no need to mention it within rails itself. | ||||
* | | Remove unneccesary default parameters | Sean Griffin | 2014-11-05 | 1 | -1/+1 |
| | | |||||
* | | Improve performance of AR object instantiation | Sean Griffin | 2014-11-05 | 5 | -11/+61 |
|/ | | | | | | | We introduced a performance hit by adding an additional iteration through a model's attributes on creation. We don't actually need the values from `Result` to be a hash, we can separate the columns and values and zip them up ourself during the iteration that we have to do. | ||||
* | Merge pull request #15956 from zuhao/refactor_activesupport_dependencies_test | Yves Senn | 2014-11-05 | 1 | -101/+124 |
|\ | | | | | | | Cleanup loaded features and constants after dependency tests. | ||||
| * | Cleanup loaded features and constants after dependency tests. | Zuhao Wan | 2014-06-28 | 1 | -100/+116 |
| | | |||||
* | | Merge pull request #17360 from bronzle/includes_and_unscoped | Yves Senn | 2014-11-05 | 3 | -0/+15 |
|\ \ | | | | | | | | | | copy reflection_scopes’s unscoped value when building scope for preloading | ||||
| * | | copy reflection_scopes’s unscoped value when building scope for ↵ | Byron Bischoff | 2014-10-22 | 2 | -0/+12 |
| | | | | | | | | | | | | preloading, fixes #11036 | ||||
* | | | Merge pull request #17521 from arunagw/aa-jobs-test-in-stats | Guillermo Iguaran | 2014-11-05 | 2 | -1/+3 |
|\ \ \ | | | | | | | | | Add test/jobs files in `rake stats` | ||||
| * | | | Add test/jobs files in `rake stats` | Arun Agrawal | 2014-11-05 | 2 | -1/+3 |
|/ / / | |||||
* | | | Update `bin/rake about` [ci skip] | Arun Agrawal | 2014-11-05 | 1 | -6/+1 |
| | | | | | | | | | | | | As we are no more displaying frameworks | ||||
* | | | Add skip-turbolinks entry to 4.2 release notes and improve changelog | Carlos Antonio da Silva | 2014-11-05 | 2 | -1/+5 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #17519 from prathamesh-sonpatki/rm-skip-gems | Carlos Antonio da Silva | 2014-11-05 | 1 | -4/+0 |
|\ \ \ | | | | | | | | | Remove skip-gems from 4-2 release notes [ci skip] | ||||
| * | | | Remove skip-gems from 4-2 release notes | Prathamesh Sonpatki | 2014-11-05 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | - This option was removed in https://github.com/rails/rails/commit/bf17c8a531bc80. - [ci skip] | ||||
* | | | | tests, add note about the usage of a specific timezone. Closes #17448. | Yves Senn | 2014-11-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #17510 from pda/ar-create-database-error-message | Carlos Antonio da Silva | 2014-11-05 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | rake db:create shows underlying error message. | ||||
| * | | | | activerecord: rake db:create shows underlying error message. | Paul Annesley | 2014-11-04 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #17473 from vipulnsward/rm-unused-method | Yves Senn | 2014-11-05 | 1 | -8/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unused duplicated method `add_column_position` from AbstractMysqlAdapter. | ||||
| * | | | | | - Remove unused duplicated method `add_column_position` from ↵ | Vipul A M | 2014-11-01 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | AbstractMysqlAdapter | ||||
* | | | | | | Merge pull request #17515 from prathamesh-sonpatki/rm-require | Yves Senn | 2014-11-05 | 2 | -2/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Removed the unused require of proxy_object | ||||
| * | | | | | | Removed the unused require of proxy_object and test related to it | Prathamesh Sonpatki | 2014-11-05 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reference : https://github.com/rails/rails/pull/17493#issuecomment-61739359 - Duration stopped inheriting from ProxyObject in https://github.com/rails/rails/pull/16574 | ||||
* | | | | | | | Merge pull request #17518 from prathamesh-sonpatki/fix-activesupport | Yves Senn | 2014-11-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Fix broken string_ext_test due to change in timezone | ||||
| * | | | | | | Fix broken string_ext_test due to change in timezone | Prathamesh Sonpatki | 2014-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Russian time was changed to UTC+3 from UTC+4 recently. This broke the string_to_ext test. | ||||
* | | | | | | | Merge pull request #17514 from y-yagi/configuring_guide | Abdelkader Boudih | 2014-11-05 | 1 | -1/+1 |
|\| | | | | | | |/ / / / / |/| | | | | | [ci skip] fix `config.assets.digest` default value | ||||
| * | | | | | [ci skip] fix `config.assets.digest` default value | yuuji.yaginuma | 2014-11-05 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #17513 from eileencodes/cleanup-rails-4.2-release-notes | Zachary Scott | 2014-11-04 | 1 | -11/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixup spelling and grammar in 4.2 guides | ||||
| * | | | | | [ci skip] Fixup spelling and grammar in 4.2 guides | eileencodes | 2014-11-04 | 1 | -11/+11 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capitalize CSS, SQL Change spelling of favour to favor - updated for consistency, the rest of the document uses "favor". Grammar / spelling pass | ||||
* | | | | | Merge branch '17106' | Aaron Patterson | 2014-11-04 | 4 | -8/+37 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | * 17106: add lib to $LOAD_PATH on application inhertence. fixes #17106 add a test for #17106 | ||||
| * | | | | add lib to $LOAD_PATH on application inhertence. fixes #17106 | Aaron Patterson | 2014-11-04 | 3 | -9/+16 |
| | | | | | |||||
| * | | | | add a test for #17106 | Aaron Patterson | 2014-11-04 | 2 | -0/+22 |
| | | | | | |||||
* | | | | | Merge pull request #17508 from ↵ | Zachary Scott | 2014-11-04 | 1 | -4/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/mention-adding-resources-to-routes Mention that articles resource should be added by user in getting started guide Fixes #17507 [ci skip] | ||||
| * | | | | | Mention that articles resource should be added by user in getting started guide | Prathamesh Sonpatki | 2014-11-05 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | Merge pull request #17443 from tomeara/added_jsonb_to_postgres_database_types | Yves Senn | 2014-11-04 | 5 | -18/+17 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Added SchemaDumper support for tables with jsonb columns |