aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Escape the parentheses in the default function regexpRafael Mendonça França2013-10-212-1/+6
| | | | | | | This is causing every default value in PostreSQL database to being handled as default function. Fixes #12581
* Merge pull request #12567 from GoBoundless/fix_postgres_structure_importYves Senn2013-10-213-1/+13
|\ | | | | Fix loading a sql structure file on postgres when the file's path has whitespace in it
| * Fix loading a sql structure file on postgres when the file's path has ↵Kevin Mook2013-10-213-1/+13
| | | | | | | | whitespace in it
* | Merge pull request #12603 from dv/fix-tilt-template-in-asset-pipeline-docsGuillermo Iguaran2013-10-211-3/+8
|\ \ | |/ |/| Update docs on Tilt::Template in Asset Pipeline guide
| * Update docs on Tilt::Template in Asset Pipeline guideDavid Verhasselt2013-10-211-3/+8
|/
* remove trailing whitespace added with b057765 [ci skip].Yves Senn2013-10-211-2/+2
|
* Merge pull request #12565 from stormsilver/unscope_fixesYves Senn2013-10-213-7/+23
|\ | | | | Allow unscope to work with `where.not`
| * Allow unscope to work with `where.not`Eric Hankins2013-10-213-7/+23
|/ | | | | | Allows you to call #unscope on a relation with negative equality operators, i.e. Arel::Nodes::NotIn and Arel::Nodes::NotEqual that have been generated through the use of where.not.
* Merge pull request #12549 from makimoto/raise-when-find-without-pkYves Senn2013-10-213-0/+13
|\ | | | | Raise an exception when model without primary key calls .find_with_ids
| * Raise an exception when model without primary key calls .find_with_idsShimpei Makimoto2013-10-213-0/+13
|/
* Merge pull request #12591 from vipulnsward/remove_mail_mergeYves Senn2013-10-201-3/+3
|\ | | | | Remove extra variable creation and merge.
| * Remove extra variable creation and merge.Vipul A M2013-10-201-3/+3
| |
* | Merge pull request #12556 from dasch/dasch/nstrument-am-processingJosé Valim2013-10-204-7/+29
|\ \ | |/ |/| Instrument the generation of Action Mailer messages
| * Instrument the generation of Action Mailer messagesDaniel Schierbeck2013-10-204-7/+29
|/ | | | | | The processing of outbound mail is instrumented with the key `process.action_mailer`. The payload includes the mailer name as well as the mailer method.
* Merge pull request #12533 from szimek/use_exists_in_relation_emptySantiago Pastorino2013-10-192-2/+5
|\ | | | | In Relation#empty? use #exists? instead of #count.
| * In Relation#empty? use #exists? instead of #count.Szymon Nowak2013-10-192-2/+5
|/
* Merge pull request #12560 from sue445/modify_find_lock_sample_codeYves Senn2013-10-181-3/+3
|\ | | | | avoid deprecation warning in sample code [ci skip]
| * [ci skip] avoid deprecation warning in sample codesue4452013-10-181-3/+3
| | | | | | | | | | Account.find(1, lock: true) -> DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it.
* | Merge pull request #11839 from chocoby/fix/convert_port_numberYves Senn2013-10-183-1/+15
|\ \ | | | | | | Convert Fixnum into String the port number like `db:structure:dump` task in MySQL.
| * | Convert Fixnum into String the port number in MySQLKenta Okamoto2013-10-183-1/+15
|/ /
* | Merge pull request #12569 from arthurnn/autosave_small_cleanipRafael Mendonça França2013-10-171-196/+196
|\ \ | | | | | | Small cleanup on autosave association
| * | Fix some indentation on autosave associationArthur Neves2013-10-171-196/+196
| | |
| * | Make define_non_cyclic_method simplerArthur Neves2013-10-171-7/+7
| | |
* | | Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docsYves Senn2013-10-171-1/+5
|\ \ \ | |/ / |/| | Add sass globbing to asset pipeline docs [ci skip]
| * | Add Sass gobbling info to asset pipeline docsDavid Verhasselt2013-10-171-1/+5
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #12564 from JuanitoFatas/association-basicsYves Senn2013-10-161-8/+8
|\ \ \ | | | | | | | | [ci skip] Fix number of methods added by association.
| * | | [ci skip] Fix number of methods added by association.Juanito Fatas2013-10-171-8/+8
| | | | | | | | | | | | | | | | Also clean up some trailing spaces on line 1143-1146.
* | | | Ensure the state is clean after one failureRafael Mendonça França2013-10-161-5/+4
| | | |
* | | | Merge pull request #12540 from wyaeld/bug/fix-recursive-digestRafael Mendonça França2013-10-163-6/+37
|\ \ \ \ | | | | | | | | | | | | | | | Ensure ActionView::Digestor.cache is correctly cleaned up
| * | | | add a new local variable to track if digests are being stored, to ensure the ↵Brad Murray2013-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | cleanup works correctly
| * | | | update digestor code based on reviewBrad Murray2013-10-151-2/+2
| | | | |
| * | | | update changelogBrad Murray2013-10-151-0/+5
| | | | |
| * | | | Ensure ActionView::Digest.cache is correctly cleaned up whenBrad Murray2013-10-151-6/+6
| | | | | | | | | | | | | | | | | | | | ActionView::Resolver.caching = false.
| * | | | Add 2 tests, 1 of which fails, to isolate the digest_caching behaviour ↵Brad Murray2013-10-151-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causing #12521 If config.action_view.cache_template_loading = false, most likely in a development configuration if config.cache_classes = false & config.action_controller.perform_caching = true. config.action_view.cache_template_loading defaults to the value of config.cache_classes
* | | | | Merge pull request #12568 from adamyonk/patch-1Rafael Mendonça França2013-10-161-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Fix typo in form_helper.rb
| * | | | Fix typo in form_helper.rbAdam Jahnke2013-10-161-1/+1
|/ / / /
* | | | Merge pull request #12545 from nateberkopec/rephrase_callback_warningYves Senn2013-10-161-1/+1
|\ \ \ \ | |_|_|/ |/| | | Rephrase ActiveRecord transaction rollback warning [ci skip]
| * | | Rephrase ActiveRecord transaction rollback warningNate Berkopec2013-10-161-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #12558 from lucasmazza/changelog-fixesRafael Mendonça França2013-10-162-12/+12
|\ \ \ \ | | | | | | | | | | Fix code blocks identation on AR and AS CHANGELOGs
| * | | | Fix code blocks identation on AR and AS CHANGELOGsLucas Mazza2013-10-162-12/+12
|/ / / /
* | | | Merge pull request #12553 from tchandy/masterGuillermo Iguaran2013-10-151-95/+0
|\ \ \ \ | | | | | | | | | | Removing unused fake models from actionpack tests
| * | | | Removing unused fake models from actionpack testsThiago Pradi2013-10-161-95/+0
|/ / / /
* | | | use the cached arel tableAaron Patterson2013-10-152-2/+2
| | | |
* | | | Fix typo in the changelog entryRafael Mendonça França2013-10-151-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Don't remove the select values to add they back againRafael Mendonça França2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
* | | | Merge pull request #12547 from derekprior/dp-fix-null-relation-pluckRafael Mendonça França2013-10-153-2/+9
|\ \ \ \ | | | | | | | | | | Pluck on NullRelation should accept a list of columns
| * | | | Pluck on NullRelation accepts a list of columnsDerek Prior2013-10-153-2/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | `pluck` was updated to accept a list of columns, but the `NullRelation` was never updated to match that signature. As a result, calling `pluck` on a `NullRelation` results in an `ArgumentError`.
* | | | grammar fix (reverted in e9a1ecd)Vijay Dev2013-10-151-1/+1
| | | |
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-10-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no ↵Vijay Dev2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer depends on/" This reverts commit 49f513c25415f94452af1bb8fe3f55f090a6d0f2. Reason: Changelogs aren't supposed to be edited in docrails.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 12:25:59 +0000