aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Added examples for url_field_tag methodZENATI YASSINE2014-04-161-0/+13
|
* [ci skip] Added examples for telephone_field_tag methodZENATI YASSINE2014-04-161-0/+13
|
* [ci skip] Added examples for search_field_tag methodZENATI YASSINE2014-04-161-0/+13
|
* Merge pull request #14779 from zenati/masterRafael Mendonça França2014-04-161-0/+13
|\ | | | | [ci skip] Added examples for color_field_tag method
| * [ci skip] Added examples for color_field_tag methodZENATI YASSINE2014-04-161-0/+13
| |
* | Merge pull request #14771 from heironimus/i18n_guide_reorderArthur Nogueira Neves2014-04-161-54/+54
|\ \ | |/ |/| Reorder i18n guide
| * [skip ci] Reorder i18n guideKyle Heironimus2014-04-161-54/+54
|/ | | | | | | | | | Currently, the section called "How to store your custom translations" has several subheadings that make no sense, such as "Translations for ActiveRecord models." These make more sense under the "Overview of the I18n API Features" section. I moved the "How to store..." section down to the more appropriate sub-headings "Using Different Backends" and "Using Different Exception Handlers" and removed the "Customize your i18n setup" header.
* Merge pull request #14773 from eric-chahin/null_relation_fixYves Senn2014-04-163-2/+19
|\ | | | | Changed the NullRelation so that when count is called with #group it wil...
| * Changed the NullRelation so that when count is called with #group it will ↵Eric Chahin2014-04-163-2/+19
| | | | | | | | | | | | | | properly return an empty hash instead of zero. Fixes issue #14721 Conflicts: activerecord/CHANGELOG.md
* | `sanitize_sql_like` escapes `escape_character` not only backslash.Yves Senn2014-04-162-5/+7
| | | | | | | | | | | | * This is a follow up to: fe4b0eee05f59831e1468ed50f55fbad0ce11e1d * The originating PR is #14222 * It should fix the build
* | Merge pull request #11836 from mcfiredrill/engines-testing-docArthur Nogueira Neves2014-04-161-0/+10
|\ \ | |/ |/| additional note about routes in functional tests for engines [ci skip]
| * additional note about routes in functional tests for engines [ci skip]Tony Miller2013-08-101-0/+10
| |
* | SQL Like escaping helper method. [Rob Gilson & Yves Senn]Rob Gilson2014-04-163-0/+48
| | | | | | | | | | | | | | | | | | Closes #14222. This is a follow up to #6104 This does not have the backwards compatibility issues brought up in implementation to break.
* | Merge pull request #14770 from crazymykl/avoid_dos_vuln_in_i18n_guideRafael Mendonça França2014-04-151-2/+2
|\ \ | | | | | | Avoid suggesting dangerous code in i18n guide
| * | [ci skip] Avoid suggesting dangerous code in i18n guideMike MacDonald2014-04-151-2/+2
|/ / | | | | | | | | | | | | | | Calling `to_sym` on user input opens apps up to Denial of Service attacks, via the symbol table being expanded to consume vast swathes of memory. It is a fairly common configuration to have DNS configured such that all subdomains route to your Rails app, in which case an attacker visits `www1.foo.com`, `www2.foo.com`, and so on until something gives. It is far less likely to have this problem with TLDs, so that change was only for consistency.
* | Merge pull request #14733 from akshay-vishnoi/test-casesRafael Mendonça França2014-04-152-16/+12
|\ \ | | | | | | Improve tests for duplicable, remove unnecessary constant
| * | Object#duplicable?Akshay Vishnoi2014-04-162-16/+12
| | | | | | | | | | | | | | | | | | 1. Improve tests 2. Remove unnecessary constant 3. Add docs for BigDecimal#duplicable?
* | | Merge pull request #14768 from spectator/ac_metal_docfixRafael Mendonça França2014-04-151-1/+2
|\ \ \ | | | | | | | | Update AC::Metal documentation example
| * | | Update AC::Metal documentation example [ci skip]Yury Velikanau2014-04-151-1/+2
|/ / / | | | | | | | | | Include proper module since AV was extracted form AP as mentioned in #14659.
* | | Add CHANGELOG entry for #14766 [ci skip]Rafael Mendonça França2014-04-151-0/+6
| | |
* | | Merge pull request #14765 from byroot/refactor-counter-cache-create-and-destroyRafael Mendonça França2014-04-153-34/+44
|\ \ \ | | | | | | | | Refactor counter cache create and destroy
| * | | Hide BelongsToAssociation#increment_counters and #decrement_countersJean Boussier2014-04-152-3/+2
| | | |
| * | | Restore the destroy_by_association check in post destroy counter cacheJean Boussier2014-04-151-2/+9
| | | |
| * | | Set _after_create_counter_called flag to make update counter cache workJean Boussier2014-04-151-1/+6
| | | |
| * | | Use inheritance chain instead of callbacks to increment counter caches after ↵Jean Boussier2014-04-142-20/+4
| | | | | | | | | | | | | | | | destroy
| * | | Use inheritance chain instead of callbacks to increment counter caches after ↵Jean Boussier2014-04-143-16/+31
| | | | | | | | | | | | | | | | create
* | | | Merge pull request #14766 from eric-chahin/migration_bugRafael Mendonça França2014-04-153-2/+30
|\ \ \ \ | | | | | | | | | | Changed change_column in PG schema_statements.rb to make sure that the u...
| * | | | Changed change_column in PG schema_statements.rb to make sure that the ↵Eric Chahin2014-04-153-2/+30
|/ / / / | | | | | | | | | | | | uuid_generate function was not being quoted.
* | | | Merge pull request #14745 from razum2um/plain-text-diagnosticsRafael Mendonça França2014-04-153-1/+11
|\ \ \ \ | | | | | | | | | | Display diagnostics in text format for xhr request
| * | | | Display diagnostics in text format for xhr requestVlad Bokov2014-04-143-1/+11
| | | | |
* | | | | Merge pull request #14762 from dwo/masterArthur Nogueira Neves2014-04-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | use YAML.load_file in database tasks example
| * | | | | use YAML.load_file in database tasks exampleRobin Tweedie2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than YAML.load(File.read(path)). YAML.load_file is also used in guides/rails_guides/helper.rb since 2011, the only other precedent I could find.
* | | | | | Merge pull request #14756 from laurocaetano/fix-count-on-association-relationRafael Mendonça França2014-04-153-9/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix count on association relation (calls to empty and size).
| * | | | | Make sure the column_name is different from 'all'.Lauro Caetano2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 968c581ea34b5236af14805e6a77913b1cb36238 have fixed the EagerLoadTest, but not in the correct way. The problem was when `empty?` or `size` was called on relation. It was triggering `count(:all)`, which was passing `:all` as the column name to `count` on Calculations. On the other hand, the method `calculate` on Calculations was calling `construct_relation_for_association_calculations` instead of `perform_calculation`, because `has_include?` was returning `true` since `column_name` was present. To prevent calling the wrong method to perform the calculation, we have to check if the `column_name` is present and if it is different from `:all` (which is now used to correctly do `count` with `select`). More information here: https://github.com/rails/rails/commit/968c581ea34b5236af14805e6a77913b1cb36238#commitcomment-6006135
| * | | | | The Association Relation should use `empty?` and `size` from Relation.Lauro Caetano2014-04-142-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 968c581ea34b5236af14805e6a77913b1cb36238 have introduced this bug #14744 on Association Relation when the method `empty?` or `size` was called. Example: # Given an author that does have 3 posts, but none of them with the # title 'Some Title' Author.last.posts.where(title: 'Some Title').size # => 3 It was occurring, because the Association Relation had implemented these methods based on `@association`, this way giving wrong results. To fix it, was necessary to remove the methods `empty?` and `size` from Association Relation. It just have to use these methods from Relation. Example: # Given an author that does have 3 posts, but none of them with the # title 'Some Title' Author.last.posts.where(title: 'Some Title').size # => 0 # Now it will return the correct value. Fixes #14744.
* | | | | | Merge pull request #14758 from JuanitoFatas/migrations-mdYves Senn2014-04-151-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Add missing end in one of the examples in Migrations.md.
| * | | | | | [ci skip] Add missing end in one of the examples in Migrations.md.Juanito Fatas2014-04-151-0/+1
|/ / / / / /
* | | | | | Merge pull request #14728 from stomar/assertion-msgYves Senn2014-04-152-14/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove surplus period from assertion messages
| * | | | | | Refine tests for assert_select failure messagesMarcus Stollsteimer2014-04-141-11/+13
| | | | | | |
| * | | | | | Remove surplus period from assertion messagesMarcus Stollsteimer2014-04-131-3/+3
| | | | | | |
* | | | | | | Merge pull request #14642 from tgxworld/fix_notifications_not_unsubscribingYves Senn2014-04-152-6/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix subscriptions not being unsubscribed.
| * | | | | | Fix subscriptions not being unsubscribed.Guo Xiang Tan2014-04-142-6/+9
| | | | | | |
* | | | | | | Make console and generators blocks works at Application instance levelRafael Mendonça França2014-04-144-0/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like rake tasks and runner blocks these blocks should also being shared between applications since they are stored at the classes. Fixes #14748
* | | | | | | :scissors:Rafael Mendonça França2014-04-141-4/+4
| | | | | | |
* | | | | | | Return null type format when format is not knowRafael Mendonça França2014-04-143-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_with_test.rb Conflicts: actionpack/CHANGELOG.md
* | | | | | | Remove outdated commentRafael Mendonça França2014-04-141-1/+0
| | | | | | |
* | | | | | | Merge pull request #14729 from akshay-vishnoi/doc_changesRichard Schneeman2014-04-142-7/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | [ci skip] Improve doc, fix grammatical issue
| * | | | | | [ci skip] Improve doc, fix grammatical issueAkshay Vishnoi2014-04-132-7/+7
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #14735 from byroot/idempotent-counter-cachesAaron Patterson2014-04-143-4/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | Idempotent counter caches, fix concurrency issues with counter caches
| * | | | | | Make counter cache decrementation on destroy idempotentJean Boussier2014-04-132-4/+26
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 06:44:47 +0000