Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | Added SchemaDumper support for tables with jsonb columns. | Ted O'Meara | 2014-11-04 | 5 | -18/+17 |
|/ / | |||||
* | | Merge pull request #17480 from gsamokovarov/exception-wrapper-traces | Rafael Mendonça França | 2014-11-04 | 2 | -29/+23 |
|\ \ | | | | | | | Move DebugExceptions#traces_from_wrapper to ExceptionWrapper | ||||
| * | | Move DebugExceptions#traces_from_wrapper to ExceptionWrapper | Genadi Samokovarov | 2014-11-03 | 2 | -29/+23 |
| | | | | | | | | | | | | | | | ActionDispatch::ExceptionWrapper seems to be the more natural place for this method to live in. | ||||
* | | | Merge branch 'master' of github.com:rails/rails | Vijay Dev | 2014-11-04 | 171 | -453/+1388 |
|\ \ \ | |||||
| * | | | fix typo [ci skip] | Vijay Dev | 2014-11-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #17504 from Gaurav2728/gaurav-update_edgeguide | Zachary Scott | 2014-11-04 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | update rails version for earlier releases in edgeguides [ci skip] | ||||
| | * | | | update rails version for earlier releases in edgeguides | Gaurav Sharma | 2014-11-04 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #17488 from rishijain/update_docs_3 | Zachary Scott | 2014-11-03 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | minor docs change [ci skip] | ||||
| | * | | | minor docs change [ci skip] | Rishi Jain | 2014-11-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #17500 from rishijain/update_docs_4 | Zachary Scott | 2014-11-03 | 1 | -2/+8 |
| |\ \ \ \ | | | | | | | | | | | | | added example for hash slice method [ci skip] | ||||
| | * | | | | fixed typo [ci skip] | Rishi Jain | 2014-11-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | added example for hash slice method [ci skip] | Rishi Jain | 2014-11-04 | 1 | -2/+8 |
| |/ / / / | |||||
| * | | | | Correct fixed-width doc syntax, thanks to @sikachu for pointing it out! | Zachary Scott | 2014-11-03 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | From dc5854f and c07c0b2 [ci skip] | ||||
| * | | | | Document included ability of AJ::QueueName module for class methods [ci skip] | Zachary Scott | 2014-11-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add documentation of AJ::QueueAdapter class methods module [ci skip] | Zachary Scott | 2014-11-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Document AJ::Execution class methods module [ci skip] | Zachary Scott | 2014-11-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Document the module which includes `perform_later` for AJ::Enqueuing [ci skip] | Zachary Scott | 2014-11-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add documentation for class methods module included for AJ::Core used | Zachary Scott | 2014-11-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | for serialization and deserialization of jobs. [ci skip] | ||||
| * | | | | Document the class methods include module for AJ::Callbacks [ci skip] | Zachary Scott | 2014-11-03 | 1 | -0/+2 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #17498 from rochefort/remove-redundant-to_s | Rafael Mendonça França | 2014-11-03 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Remove redundant `to_s` in interpolation | ||||
| | * | | | Remove redundant `to_s` in interpolation | rochefort | 2014-11-04 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Remove unneeded autoload | Rafael Mendonça França | 2014-11-03 | 1 | -4/+1 |
| | | | | |||||
| * | | | Merge pull request #17494 from craftsmen/issue-17484 | Zachary Scott | 2014-11-03 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | Change `rails` to `bin/rails` in getting started, fix #1748 [ci skip] | ||||
| | * | | | Change `rails` to `bin/rails` in getting started, fix #1748 [ci skip] | kevcha | 2014-11-03 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #17487 from pabloh/avoid_allocations | Rafael Mendonça França | 2014-11-03 | 5 | -5/+5 |
| |\ \ \ \ | | | | | | | | | | | | | Avoid unnecessary allocations and method calls | ||||
| | * | | | | Avoid unnecessary allocations/calls | Pablo Herrero | 2014-11-02 | 5 | -5/+5 |
| | | | | | | |||||
| * | | | | | Merge pull request #17383 from rwz/string-remove | Rafael Mendonça França | 2014-11-03 | 3 | -8/+26 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `String#remove` and `String#remove!` accept multiple arguments Conflicts: activesupport/CHANGELOG.md | ||||
| | * | | | | Make `String#remove` and `String#remove!` accept multiple arguments | Pavel Pravosud | 2014-10-25 | 3 | -8/+26 |
| | | | | | | |||||
| * | | | | | Add comment to point out String#[] is intentional | Andrew White | 2014-11-02 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Revert "Replace String index juggling with Pathname goodness in ↵ | yuuji.yaginuma | 2014-11-02 | 2 | -1/+11 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db:fixtures:load" This reverts commit 482fdad5ef8a73688b50bba3991dd4ef6f286edd. Fixes #17237. | ||||
| * | | | | Add an `assert_deprecated` for `sanitize_sql_hash_for_conditions` | Sean Griffin | 2014-11-02 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Handle `RangeError` from casting in `find_by` and `find_by!` on Relation | Sean Griffin | 2014-11-02 | 2 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We should not behave differently just because a class has a default scope. | ||||
| * | | | | Revert deprecation of `sanitize_sql_hash_for_assignment` | Sean Griffin | 2014-11-02 | 2 | -6/+2 |
| | | | | | | | | | | | | | | | | | | | | This method is still used by `update_all` | ||||
| * | | | | Deprecate `sanitize_sql_hash_` methods on ActiveRecord | Sean Griffin | 2014-11-02 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | These appear to be implementation relics of times past. They duplicate the logic in Relation, and are no longer used internally. | ||||
| * | | | | Pass the `SelectManager`, rather than the AST when querying w/ Relation | Sean Griffin | 2014-11-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arel specifically handles `SelectManager`, with the same logic we're currently performing. The AST is `Enumerable`, which Arel looks for separately now. | ||||
| * | | | | Tiny documentation styling fixes [ci skip] | Robin Dupret | 2014-11-02 | 3 | -18/+24 |
| | | | | | |||||
| * | | | | Merge pull request #17469 from rishijain/update_docs_2 | Zachary Scott | 2014-11-02 | 2 | -2/+4 |
| |\ \ \ \ | | | | | | | | | | | | | added punctuations, and role of queue_adapter module [ci skip] | ||||
| | * | | | | placed description at correct place [ci skip] | Rishi Jain | 2014-11-01 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | added punctuations, and role of queue_adapter module [ci skip] | Rishi Jain | 2014-11-01 | 2 | -2/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #17483 from pabloh/optimize_gsub_calls | Sean Griffin | 2014-11-01 | 5 | -5/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Call gsub with a Regexp instead of a String for better performance | ||||
| | * | | | | | Call gsub with a Regexp instead of a String for better performance | Pablo Herrero | 2014-11-01 | 5 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Don't duplicate predicate building logic in Relation finders | Sean Griffin | 2014-11-01 | 1 | -5/+2 |
| | | | | | | | |||||
| * | | | | | | Add a test case for range type casting | Sean Griffin | 2014-11-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We support this behavior, but have no tests which assert that type casting actually occurs. | ||||
| * | | | | | | Use a bound parameter for the "id = " portion of update statements | Sean Griffin | 2014-11-01 | 2 | -5/+14 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to re-order the bind parameters since the AST returned by the relation will have the where statement as the first bp, which breaks on PG. |