aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17572 from rishijain/update_docs_10Zachary Scott2014-11-093-1/+5
|\ | | | | Fixed grammar about AS::Notifications [ci skip]
| * added description for rails generators, and fixed sentence formation for ↵Rishi Jain2014-11-103-1/+5
|/ | | | active_support/notifications [ci skip]
* Merge pull request #17217 from codeodor/fix-17119Aaron Patterson2014-11-097-3/+25
|\ | | | | Ensure HABTM relationships produce valid class names (Fixes #17119)
| * Ensure HABTM relationships produce valid class names (Fixes #17119)Sammy Larbi2014-11-097-3/+25
|/
* Merge pull request #17564 from yui-knk/fix/command_line_guideRobin Dupret2014-11-091-1/+1
|\ | | | | [ci skip] Fix typo in command_line.md
| * [ci skip] Fix typo in command_line.mdyui-knk2014-11-091-1/+1
|/
* Merge pull request #17563 from yui-knk/fix/source_annotation_extractorZachary Scott2014-11-081-3/+2
|\ | | | | [ci skip] Fix comment of SourceAnnotationExtractor#find_in
| * Fix comment of SourceAnnotationExtractor#find_inyui-knk2014-11-091-3/+2
|/ | | | | | Commit(810af6f) changed which extensions are taken into account, so make to match comment of find_in. And sort extensions to follow the added order.
* Documenting Rails::Info module [ci skip]Zachary Scott2014-11-081-0/+3
|
* Merge pull request #17557 from yui-knk/fix/command_line_guideVijay Dev2014-11-081-6/+2
|\ | | | | [ci skip] Fix line break on command line guide
| * [ci skip] Fix line break on command line guideyui-knk2014-11-081-6/+2
| |
* | Merge pull request #17559 from alfa-jpn/fix/singular_association_cacheSantiago Pastorino2014-11-082-1/+31
|\ \ | | | | | | default scopes should break the cache on singulur_association.
| * | default scopes should break the cache on singulur_association.alfa-jpn2014-11-082-1/+31
| |/ | | | | | | fixes #17495
* | Merge pull request #17476 from robin850/job-testingRobin Dupret2014-11-081-0/+62
|\ \ | |/ |/| Add a section about job testing [ci skip]
| * Add a section about job testing [ci skip]Ryan Selk2014-11-021-0/+62
| | | | | | | | | | | | | | | | * Cover lower level job testing (assertions about the execution of the job itself). * Add a table with the custom assertions provided by Active Job's `TestHelper` module. * Add an example testing job queuing inside a model
* | Merge pull request #17493 from petewest/duration-comparableAaron Patterson2014-11-072-0/+14
|\ \ | | | | | | Delegate comparison operator to value
| * | Delegate comparison operator to valuePeter West2014-11-032-0/+14
| | |
* | | default scopes should break the cache on has_many.Aaron Patterson2014-11-072-1/+28
| | | | | | | | | | | | | | | | | | if you specify a default scope on a model, it will break caching. We cannot predict what will happen inside the scope, so play it safe for now. fixes #17495
* | | Merge pull request #17552 from jipe/masterYves Senn2014-11-071-1/+1
|\ \ \ | | | | | | | | Guides: Corrected name for assigns key [ci skip]
| * | | Guides: Corrected name for assigns key [ci skip]Jimmy Petersen2014-11-071-1/+1
|/ / / | | | | | | | | | | | | - Integration test example is now using 'articles' name for both path and assigns key.
* | | pg tests, get rid of `sql_types_test.rb`.Yves Senn2014-11-073-18/+14
| | |
* | | pg tests, only execute what's necessary.Yves Senn2014-11-072-27/+26
| | |
* | | remove the last traces of OpenBase from our codebase. [ci skip]Yves Senn2014-11-071-6/+0
| | |
* | | docs, the abstract data type `:timestamp` was removed. See #15184 [ci skip]Yves Senn2014-11-071-2/+2
| | |
* | | Merge pull request #17551 from y-yagi/fix_command_line_guideZachary Scott2014-11-071-2/+2
|\ \ \ | | | | | | | | [ci skip] modify default host in command line guide
| * | | [ci skip] modify default host in command line guideyuuji.yaginuma2014-11-071-2/+2
|/ / /
* | | Merge pull request #17541 from OpenSourceProjects/meaninful_messageYves Senn2014-11-073-5/+15
|\ \ \ | | | | | | | | | | | | Print out a meaningful error when ActiveRecord::ReadOnlyRecord is raised
| * | | Print out a meaningful error when ActiveRecord::ReadOnlyRecord is raisedFranky W2014-11-062-5/+8
|/ / / | | | | | | | | | | | | | | | | | | Currently, there is no messages which get printed out. Convoluted system may have hooks that create other objects in which case we only fail with no messages. This commit changes this information allowing you to know which object is the one that actually raised the error.
* | | Merge pull request #17545 from marzapower/dirty_public_apiRafael Mendonça França2014-11-061-1/+1
|\ \ \ | | | | | | | | [Enh] Made the ActiveModel::Dirty#clear_attribute_changes method public
| * | | [Enh] Changed the visibility of the ↵Daniele Di Bernardo2014-11-061-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_9Rafael Mendonça França2014-11-062-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 Jain2014-11-072-5/+11
|/ / /
* | | tests, remove unneeded requires.Yves Senn2014-11-064-11/+0
| | |
* | | tests, use SchemaDumpingHelper to dump a specific table.Yves Senn2014-11-061-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_routingRafael Mendonça França2014-11-063-0/+41
|\ \ \ | | | | | | | | Remove session to allow `with_routing` to be called twice.
| * | | Remove session to allow `with_routing` to be called twice.Guo Xiang Tan2014-11-053-0/+41
| | | | | | | | | | | | | | | | Fixes: https://github.com/rails/rails/issues/16814
* | | | Merge pull request #17536 from vipulnsward/fix-group-expression-warningRafael Mendonça França2014-11-061-2/+2
|\ \ \ \ | | | | | | | | | | Fixed grouped expression warning
| * | | | Fix grouped expression warning - `warning: (...) interpreted as grouped ↵Vipul A M2014-11-061-2/+2
|/ / / / | | | | | | | | | | | | expression`
* | | | Merge pull request #17526 from rishijain/update_docs_6Vijay Dev2014-11-062-0/+15
|\ \ \ \ | | | | | | | | | | Update docs 6
| * | | | added example of squish!, remove, test case for multiple occurrence ofRishi Jain2014-11-062-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 Senn2014-11-062-7/+14
| | | | | | | | | | | | | | | | | | | | /cc @chancancode
* | | | | Merge pull request #17529 from slothbear/patch-1Yves Senn2014-11-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove redundancy [ci skip]
| * | | | | Remove redundancyPaul Morganthall2014-11-061-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-htmlYves Senn2014-11-061-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Replace Html with HTML [ci skip]
| * | | | | Replace Html with HTML [ci skip]Prathamesh Sonpatki2014-11-061-2/+2
|/ / / / / | | | | | | | | | | | | | | | - Everywhere else we using HTML Sanitizer except this place.
* | | | | Merge pull request #17528 from revans/respond_with_docGuillermo Iguaran2014-11-062-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 placeRobert Evans2014-11-052-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 parametersSean Griffin2014-11-051-1/+1
| | | |
* | | | Improve performance of AR object instantiationSean Griffin2014-11-055-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_testYves Senn2014-11-051-101/+124
|\ \ \ | | | | | | | | | | | | Cleanup loaded features and constants after dependency tests.