aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed the unused require of proxy_object and test related to itPrathamesh Sonpatki2014-11-052-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 #17513 from eileencodes/cleanup-rails-4.2-release-notesZachary Scott2014-11-041-11/+11
|\ | | | | Fixup spelling and grammar in 4.2 guides
| * [ci skip] Fixup spelling and grammar in 4.2 guideseileencodes2014-11-041-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 Patterson2014-11-044-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 #17106Aaron Patterson2014-11-043-9/+16
| |
| * add a test for #17106Aaron Patterson2014-11-042-0/+22
| |
* | Merge pull request #17508 from ↵Zachary Scott2014-11-041-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 guidePrathamesh Sonpatki2014-11-051-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #17443 from tomeara/added_jsonb_to_postgres_database_typesYves Senn2014-11-045-18/+17
|\ \ \ | |/ / |/| | Added SchemaDumper support for tables with jsonb columns
| * | Added SchemaDumper support for tables with jsonb columns.Ted O'Meara2014-11-045-18/+17
|/ /
* | Merge pull request #17480 from gsamokovarov/exception-wrapper-tracesRafael Mendonça França2014-11-042-29/+23
|\ \ | | | | | | Move DebugExceptions#traces_from_wrapper to ExceptionWrapper
| * | Move DebugExceptions#traces_from_wrapper to ExceptionWrapperGenadi Samokovarov2014-11-032-29/+23
| | | | | | | | | | | | | | | ActionDispatch::ExceptionWrapper seems to be the more natural place for this method to live in.
* | | Merge branch 'master' of github.com:rails/railsVijay Dev2014-11-04171-453/+1388
|\ \ \
| * | | fix typo [ci skip]Vijay Dev2014-11-041-1/+1
| | | |
| * | | Merge pull request #17504 from Gaurav2728/gaurav-update_edgeguideZachary Scott2014-11-041-1/+1
| |\ \ \ | | | | | | | | | | update rails version for earlier releases in edgeguides [ci skip]
| | * | | update rails version for earlier releases in edgeguidesGaurav Sharma2014-11-041-1/+1
| |/ / /
| * | | Merge pull request #17488 from rishijain/update_docs_3Zachary Scott2014-11-031-2/+2
| |\ \ \ | | | | | | | | | | minor docs change [ci skip]
| | * | | minor docs change [ci skip]Rishi Jain2014-11-031-2/+2
| | | | |
| * | | | Merge pull request #17500 from rishijain/update_docs_4Zachary Scott2014-11-031-2/+8
| |\ \ \ \ | | | | | | | | | | | | added example for hash slice method [ci skip]
| | * | | | fixed typo [ci skip]Rishi Jain2014-11-041-1/+1
| | | | | |
| | * | | | added example for hash slice method [ci skip]Rishi Jain2014-11-041-2/+8
| |/ / / /
| * | | | Correct fixed-width doc syntax, thanks to @sikachu for pointing it out!Zachary Scott2014-11-032-2/+2
| | | | | | | | | | | | | | | | | | | | From dc5854f and c07c0b2 [ci skip]
| * | | | Document included ability of AJ::QueueName module for class methods [ci skip]Zachary Scott2014-11-031-0/+1
| | | | |
| * | | | Add documentation of AJ::QueueAdapter class methods module [ci skip]Zachary Scott2014-11-031-0/+1
| | | | |
| * | | | Document AJ::Execution class methods module [ci skip]Zachary Scott2014-11-031-0/+1
| | | | |
| * | | | Document the module which includes `perform_later` for AJ::Enqueuing [ci skip]Zachary Scott2014-11-031-0/+1
| | | | |
| * | | | Add documentation for class methods module included for AJ::Core usedZachary Scott2014-11-031-0/+2
| | | | | | | | | | | | | | | | | | | | for serialization and deserialization of jobs. [ci skip]
| * | | | Document the class methods include module for AJ::Callbacks [ci skip]Zachary Scott2014-11-031-0/+2
| | |_|/ | |/| |
| * | | Merge pull request #17498 from rochefort/remove-redundant-to_sRafael Mendonça França2014-11-031-1/+1
| |\ \ \ | | | | | | | | | | Remove redundant `to_s` in interpolation
| | * | | Remove redundant `to_s` in interpolationrochefort2014-11-041-1/+1
| |/ / /
| * | | Remove unneeded autoloadRafael Mendonça França2014-11-031-4/+1
| | | |
| * | | Merge pull request #17494 from craftsmen/issue-17484Zachary Scott2014-11-030-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]kevcha2014-11-031-3/+3
| | | | |
| * | | | Merge pull request #17487 from pabloh/avoid_allocationsRafael Mendonça França2014-11-035-5/+5
| |\ \ \ \ | | | | | | | | | | | | Avoid unnecessary allocations and method calls
| | * | | | Avoid unnecessary allocations/callsPablo Herrero2014-11-025-5/+5
| | | | | |
| * | | | | Merge pull request #17383 from rwz/string-removeRafael Mendonça França2014-11-033-8/+26
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `String#remove` and `String#remove!` accept multiple arguments Conflicts: activesupport/CHANGELOG.md
| | * | | | Make `String#remove` and `String#remove!` accept multiple argumentsPavel Pravosud2014-10-253-8/+26
| | | | | |
| * | | | | Add comment to point out String#[] is intentionalAndrew White2014-11-021-0/+1
| | | | | |
| * | | | | Revert "Replace String index juggling with Pathname goodness in ↵yuuji.yaginuma2014-11-022-1/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db:fixtures:load" This reverts commit 482fdad5ef8a73688b50bba3991dd4ef6f286edd. Fixes #17237.
| * | | | Add an `assert_deprecated` for `sanitize_sql_hash_for_conditions`Sean Griffin2014-11-021-1/+3
| | | | |
| * | | | Handle `RangeError` from casting in `find_by` and `find_by!` on RelationSean Griffin2014-11-022-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | We should not behave differently just because a class has a default scope.
| * | | | Revert deprecation of `sanitize_sql_hash_for_assignment`Sean Griffin2014-11-022-6/+2
| | | | | | | | | | | | | | | | | | | | This method is still used by `update_all`
| * | | | Deprecate `sanitize_sql_hash_` methods on ActiveRecordSean Griffin2014-11-022-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/ RelationSean Griffin2014-11-021-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 Dupret2014-11-023-18/+24
| | | | |
| * | | | Merge pull request #17469 from rishijain/update_docs_2Zachary Scott2014-11-022-2/+4
| |\ \ \ \ | | | | | | | | | | | | added punctuations, and role of queue_adapter module [ci skip]
| | * | | | placed description at correct place [ci skip]Rishi Jain2014-11-011-2/+2
| | | | | |
| | * | | | added punctuations, and role of queue_adapter module [ci skip]Rishi Jain2014-11-012-2/+4
| | | | | |
| * | | | | Merge pull request #17483 from pabloh/optimize_gsub_callsSean Griffin2014-11-015-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 performancePablo Herrero2014-11-015-5/+5
| | | | | | |