aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix bad usage of #select with hashCarlos Antonio da Silva2013-12-031-1/+1
|
* Merge pull request #11643 from vipulnsward/query_cache_clearCarlos Antonio da Silva2013-12-033-1/+15
|\ | | | | Fix QueryCache to work with nested blocks
| * Currently, we clear query_cache in cache block finish, even if we may ↵Vipul A M2013-12-033-1/+15
|/ | | | | | already have cache true. This commit takes into account the last cache_enabled value, before clearing query_cache.
* Merge pull request #13022 from pwnall/fixture_contextYves Senn2013-12-036-1/+116
|\ | | | | Introduce a context for rendering fixtures ERB.
| * Introduce a context for rendering fixtures ERB.Victor Costan2013-12-036-1/+116
|/ | | | | | | | | | Fixture files are passed through an ERB renderer before being read as YAML. The rendering is currently done in the context of the main object, so method definitons leak into other fixtures, and there is no clean place to define fixture helpers. After this commit, the ERB renderer will use a new subclass of ActiveRecord::FixtureSet.context_class each time a fixture is rendered.
* Convert Mime::NullType in a singletonGuillermo Iguaran2013-12-031-1/+4
|
* Cleanups in comment about conditionalGuillermo Iguaran2013-12-031-1/+2
|
* Merge branch 'format_localized_template' of https://github.com/acapilleri/railsGuillermo Iguaran2013-12-034-1/+22
|\ | | | | | | | | Conflicts: actionpack/CHANGELOG.md
| * Fix header Content-Type: #<Mime::NullType:...> in localized templateAngelo capilleri2013-12-034-1/+22
| | | | | | | | | | | | | | | | This PR fixes #13064 regression bug introduced by the #8085 Now in _process_format when the format is a Mime::NullType nothing is written in self.content_type. In this way the method Response#assign_default_content_type_and_charset can write the the default mime_type.
* | Tidy up previous commit, fix message assertion and improve testsCarlos Antonio da Silva2013-12-032-2/+9
| |
* | Modify the Hash#assert_valid_keys error message so that it shows the valid ↵Nerian2013-12-033-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keys. Also, show the wrong value as it was entered. { :failore => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ]) => ArgumentError: Unknown key: failore { 'failore' => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ]) => ArgumentError: Unknown key: failore { 'failore' => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ]) => ArgumentError: Unknown key: "failore". Valid keys are: :failure, :funny { :failore => "stuff", :funny => "business" }.assert_valid_keys([ :failure, :funny ]) => ArgumentError: Unknown key: :failore. Valid keys are: :failure, :funny Conflicts: activerecord/CHANGELOG.md Closes #11624.
* | Merge pull request #13060 from chancancode/change_log_for_json_refactorCarlos Antonio da Silva2013-12-023-0/+59
|\ \ | | | | | | CHANGELOG for JSON refactor + added back the `encode_big_decimal_as_string` option with warning
| * | Added back the `encode_big_decimal_as_string` option with warningGodfrey Chan2013-12-023-0/+59
| | | | | | | | | | | | | | | Also added the missing CHANGELOG entry for #12183 @ 80e7552073 and 4d02296cfb.
* | | Avoid generating more strings while iterating to create methodsCarlos Antonio da Silva2013-12-021-1/+1
| | | | | | | | | | | | | | | Use the already existing strings instead of creating a new one each time just to test if it responds to the methods.
* | | Merge remote-tracking branch 'origin/master'Rafael Mendonça França2013-12-0218-21/+41
|\ \ \
| * \ \ Merge pull request #12123 from aredondo/masterCarlos Antonio da Silva2013-12-021-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add regression test for IpSpoofAttackError issue Closes #10780
| | * | | Add regression test for IpSpoofAttackError issueAlvaro Redondo2013-09-031-0/+8
| | | | | | | | | | | | | | | | | | | | See #10780
| * | | | Remove note about removed local_constant_names method from guides [ci skip]Carlos Antonio da Silva2013-12-021-1/+1
| | | | |
| * | | | Remove dead comment from AS extensions guide [ci skip]Carlos Antonio da Silva2013-12-021-2/+0
| | | | |
| * | | | Fix note about class attribute accessors deprecated file [ci skip]Carlos Antonio da Silva2013-12-021-1/+1
| | | | |
| * | | | Merge pull request #13138 from gsamokovarov/remove-cattr-requiresGuillermo Iguaran2013-12-0215-15/+15
| |\ \ \ \ | | | | | | | | | | | | Remove deprecated cattr_* requires
| | * | | | Remove deprecated cattr_* requiresGenadi Samokovarov2013-12-0315-15/+15
| | | | | |
| * | | | | Add number and range field to form helpers articleJuanito Fatas2013-12-021-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also wrap surrounding text to 80 chars. [ci skip] Closes #13132
* | | | | | :sicssors:Rafael Mendonça França2013-12-028-15/+2
| | | | | |
* | | | | | Options are not optionalRafael Mendonça França2013-12-021-2/+2
| | | | | |
* | | | | | Make execute priave APIRafael Mendonça França2013-12-027-12/+16
| | | | | |
* | | | | | Make load of NumberHelper thread safeRafael Mendonça França2013-12-029-26/+18
| | | | | |
* | | | | | Merge pull request #10996 from mattdbridges/number-helper-refactorRafael Mendonça França2013-12-0210-312/+533
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and clean up number helpers Conflicts: activesupport/lib/active_support/number_helper.rb
| * | | | | Extract ActiveSupport::NumberHelper methods to classesMatt Bridges2013-07-0110-314/+533
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the overall complexity of each method individually as well as the global shared private module methods, this pulls each helper into it's own converter class inheriting from a generic `NumberBuilder` class. * The `NumberBuilder` class contains the private methods needed for each helper method an eliminates the need for special definition of specialized private module methods. * The `ActiveSupport::NumberHelper::DEFAULTS` constant has been moved into the `NumberBuilder` class because the `NumberBuilder` is the only class which needs access to it. * For each of the builders, the `#convert` method is broken down to smaller parts and extracted into private methods for clarity of purpose. * Most of the mutation that once was necessary has now been eliminated. * Several of the mathematical operations for percentage, delimited, and rounded have been moved into private methods to ease readability and clarity. * Internationalization is still a bit crufty, and definitely could be improved, but it is functional and a bit easier to follow. The following helpers were extracted into their respective classes. * `#number_to_percentage` -> `NumberToPercentageConverter` * `#number_to_delimited` -> `NumberToDelimitedConverter` * `#number_to_phone` -> `NumberToPhoneConverter` * `#number_to_currency` -> `NumberToCurrencyConverter` * `#number_to_rounded` -> `NumberToRoundedConverter` * `#number_to_human_size` -> `NumberToHumanSizeConverter` * `#number_to_human` -> `NumberToHumanConverter`
* | | | | | Make ActionView::Tags loading tread safeRafael Mendonça França2013-12-024-32/+40
| |/ / / / |/| | | |
* | | | | Merge pull request #11197 from gsamokovarov/unify-mattr-cattrGuillermo Iguaran2013-12-027-271/+196
|\ \ \ \ \ | | | | | | | | | | | | Unify cattr and mattr accessors declarations
| * | | | | Unify cattr and mattr accessors declarationsGenadi Samokovarov2013-12-027-271/+196
| | | | | |
* | | | | | Wrap 80 columns [ci skip]Rafael Mendonça França2013-12-021-5/+10
| | | | | |
* | | | | | Add documentation about the Action Dispatch salt configurationRafael Mendonça França2013-12-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Use alphabetic orderRafael Mendonça França2013-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | :scissors:Rafael Mendonça França2013-12-022-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Make the release notes consistent [ci skip]Rafael Mendonça França2013-12-021-66/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
* | | | | | Make the tests break againRafael Mendonça França2013-12-021-2/+0
|/ / / / / | | | | | | | | | | | | | | | We need to fix this test
* | | | | activemodel isn't a runtime dependency for actionviewGuillermo Iguaran2013-12-021-2/+2
| | | | |
* | | | | Merge pull request #13134 from rubiii/patch-1Carlos Antonio da Silva2013-12-021-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | added missing require to active_support/tagged_logging
| * | | | added missing requireDaniel Harrington2013-12-021-0/+1
|/ / / / | | | | | | | | we’re using .delegate and should require it.
* | | | `mail()` without arguments is a getter for the current mail.Yves Senn2013-12-023-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior is documented in our guides (http://edgeguides.rubyonrails.org/action_mailer_basics.html#action-mailer-callbacks) but was broken in the past. This commit short curcuits the `mail` method if: 1. mail() was previously called 2. no headers are passed 3. no block is passed Closes #13090. /cc @pixeltrix
* | | | Merge pull request #13117 from akshay-vishnoi/typoXavier Noria2013-12-028-12/+12
|\ \ \ \ | | | | | | | | | | Typo and grammatical fixes [ci skip]
| * | | | Typo and grammatical fixes [ci skip]Akshay Vishnoi2013-12-028-12/+12
| | | | |
* | | | | Merge pull request #11466 from jetthoughts/updated_tesing_guidesYves Senn2013-12-021-9/+14
|\ \ \ \ \ | | | | | | | | | | | | Fix `rake test` description in the guides [ci skip]
| * | | | | Add `rake test:all`, `rake test:all:db` to guidePaul Nikitochkin2013-11-301-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | `ActionView::MissingTemplate` for partials includes underscore.Yves Senn2013-12-024-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing partial folder/_partial instead of folder/partial. Closes #13002.
* | | | | | Merge pull request #12365 from jbaudanza/reorderGuillermo Iguaran2013-12-012-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move Rack::Cache after ActionDispatch::Static in the middleware stack
| * | | | | | Move Rack::Cache after AD::Static in the stackJonathan Baudanza2013-09-252-6/+6
| | | | | | |
* | | | | | | Update active_record_querying.mdGuillermo Iguaran2013-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | he or she => they
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 01:59:37 +0000