aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Retain ActionPack dependency on ActionViewŁukasz Strzałkowski2013-12-056-22/+5
| | | |
* | | | Merge pull request #12646 from severin/polymorphic_belongs_to_touchYves Senn2013-12-053-17/+63
|\ \ \ \ | | | | | | | | | | polymorphic belongs_to association with touch: true updates old record correctly
| * | | | polymorphic belongs_to association with touch: true updates old record correctlySeverin Schoepke2013-12-053-17/+63
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: Given you have a comments model with a polymorphic commentable association (e.g. books and songs) with the touch option set. Every time you update a comment its commentable should be touched. This was working when you changed attributes on the comment or when you moved the comment from one book to another. However, it was not working when moving a comment from a book to a song. This is now fixed.
* | | | Merge pull request #13190 from senny/set_enforce_available_locales_firstCarlos Antonio da Silva2013-12-053-0/+21
|\ \ \ \ | | | | | | | | | | Set `i18n.enforce_available_locales` before any other configuration option.
| * | | | set `i18n.enforce_available_locales` before `i18n.default_locale`.Yves Senn2013-12-053-0/+21
|/ / / /
* | | | add missing CHANGELOG entry for d8c6f52. [ci skip]Yves Senn2013-12-052-0/+8
| | | | | | | | | | | | | | | | Discoverd by #13175.
* | | | end sentences with a `.`. [ci skip]Yves Senn2013-12-053-12/+14
| | | |
* | | | Merge pull request #13185 from Jashank/patch-1Jeremy Kemper2013-12-041-1/+1
|\ \ \ \ | | | | | | | | | | docs: Replace an unpleasant grammatical construct.
| * | | | Rails on Rack: Replace an unpleasant grammatical construct.Jashank Jeremy2013-12-051-1/+1
|/ / / / | | | | | | | | [ci skip]
* | | | 2.1.0 is fineRafael Mendonça França2013-12-051-1/+0
| | | |
* | | | Use the released arel gemRafael Mendonça França2013-12-052-2/+1
| | | |
* | | | Merge pull request #12995 from rails/application-verifierRafael Mendonça França2013-12-044-6/+97
|\ \ \ \ | | | | | | | | | | Add Application#message_verifier method to return a message verifier
| * | | | Hightlight message verifier in the release notes [ci skip]Rafael Mendonça França2013-12-041-0/+11
| | | | |
| * | | | Make salt argument required for message verifierRafael Mendonça França2013-12-043-13/+13
| | | | |
| * | | | Fix typosRafael Mendonça França2013-12-042-3/+3
| | | | |
| * | | | Test if two different verifiers don't share the same secretRafael Mendonça França2013-12-041-2/+12
| | | | |
| * | | | Update the releases notesRafael Mendonça França2013-12-041-0/+1
| | | | |
| * | | | Don't need to use a controller to test the verifierRafael Mendonça França2013-12-041-9/+3
| | | | |
| * | | | No need to configure saltsRafael Mendonça França2013-12-043-34/+7
| | | | |
| * | | | Make possibile to get different message verifiersRafael Mendonça França2013-12-043-10/+37
| | | | |
| * | | | Add missing requireRafael Mendonça França2013-12-041-0/+1
| | | | |
| * | | | Rename verifier to message_verifierRafael Mendonça França2013-12-043-10/+10
| | | | |
| * | | | Add documentation and CHANGELOG entry to Application#verifierRafael Mendonça França2013-12-042-0/+21
| | | | |
| * | | | Add application verifierRafael Mendonça França2013-12-042-0/+53
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is an application global verifier that can be used to generate and verify signed messages. See the documentation of ActiveSupport::MessageVerifier for more information.
* | | | make the type_map per connection. fixes #13182Aaron Patterson2013-12-042-12/+17
| | | |
* | | | Merge pull request #13183 from sorah/never_ignore_i18n_translate_raise_optionCarlos Antonio da Silva2013-12-043-1/+22
|\ \ \ \ | | | | | | | | | | Escalate missing error when :raise is true in translate helper, fix regression introduced by security fix.
| * | | | Escalate missing error when :raise is trueShota Fukumori (sora_h)2013-12-053-1/+22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before ec16ba75a5493b9da972eea08bae630eba35b62f, ActionView::Helpers::TranslationHelper#translate has raised errors with specifying options[:raise] to true. This should work by this fix: begin t(:"translations.missing", raise: true) rescue I18n::MissingTranslationData p :hello! end
* | | | Run Travis tests using Ruby 2.1.0-preview2 tooSantiago Pastorino2013-12-041-0/+2
| | | |
* | | | Update changelog [ci skip]Rafael Mendonça França2013-12-041-2/+2
| | | |
* | | | Update guides welcome page to point to version 3.2.16 [ci skip]Arun Agrawal2013-12-041-2/+2
| | | |
* | | | Merge pull request #13177 from kuldeepaggarwal/doc-upgradeRafael Mendonça França2013-12-041-2/+2
|\ \ \ \ | | | | | | | | | | update guides to new version of rails 3.2.x [ci skip]
| * | | | update guides to new version of rails 3.2.x[ci skip]Kuldeep Aggarwal2013-12-051-2/+2
| | | | |
* | | | | Review json_escape docs [ci skip]Carlos Antonio da Silva2013-12-041-22/+22
|/ / / /
* | | | Merge pull request #13073 from chancancode/json_escapeJeremy Kemper2013-12-043-14/+107
|\ \ \ \ | | | | | | | | | | Fixed json_escape (again)
| * | | | Also move html_esacpe regex to a constant (see 9d25af60)Godfrey Chan2013-12-041-1/+2
| | | | |
| * | | | Added \u2028 \u2029 to json_escapeGodfrey Chan2013-12-043-6/+12
| | | | |
| * | | | Use lower case letters in unicodes sequences to match the new encoder's outputGodfrey Chan2013-12-042-4/+4
| | | | |
| * | | | Fixed a long-standing bug in `json_escape` that strips quotation marksGodfrey Chan2013-12-042-12/+53
| | | | |
| * | | | Added failing test for json_escape striping quotation marksGodfrey Chan2013-12-041-0/+45
|/ / / / | | | | | | | | | | | | Expanded test coverage for html_escape and json_escape
* | | | Merge pull request #13171 from kuldeepaggarwal/test-case-updationRafael Mendonça França2013-12-041-1/+0
|\ \ \ \ | | | | | | | | | | removed duplicate test case
| * | | | removed duplicate test caseKuldeep Aggarwal2013-12-041-1/+0
| | | | |
* | | | | Merge pull request #13170 from acapilleri/remove_return_nilRafael Mendonça França2013-12-041-3/+1
|\ \ \ \ \ | |/ / / / |/| | | | remove nil in NullType#ref.
| * | | | remove nil in NullType#ref.Angelo capilleri2013-12-041-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Return Nil is implicit in a method and this syntax is used in the others classes
* | | | | mention Active Record enums as major feature for 4.1. [ci skip]Yves Senn2013-12-041-0/+23
|/ / / /
* | | | Merge pull request #13167 from fluxusfrequency/patch-3Carlos Antonio da Silva2013-12-041-13/+17
|\ \ \ \ | | | | | | | | | | Formatting, capitalization, and punctuation fixes [ci skip]
| * | | | Formatting, capitalization, and punctuation fixes [ci skip]Ben Lewis2013-12-041-13/+17
|/ / / / | | | | | | | | Second try on this commit.
* | | | Merge pull request #13152 from mariovisic/text_helper_missing_raw_methodCarlos Antonio da Silva2013-12-042-0/+7
|\ \ \ \ | | | | | | | | | | TextHelper#simple_format attempts to call undefined raw method
| * | | | Fix issue where TextHelper#simple_format was calling missing 'raw' methodMario Visic2013-12-052-0/+7
| | | | |
* | | | | Merge pull request #12403 from thedarkone/attr-method-missing-fixRafael Mendonça França2013-12-042-3/+51
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix AR#method_missing re-dispatching into overwritten attribute methods Conflicts: activerecord/lib/active_record/attribute_methods.rb
| * | | | Fix AR#method_missing re-dispatching into overwritten attribute methods.thedarkone2013-09-292-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was happening when a `super` call in an overwritten attribute method was triggering a method_missing fallback, because attribute methods haven't been generated yet. class Topic < ActiveRecord::Base def title # `super` would re-invoke this method if define_attribute_methods # hasn't been called yet resulting in double '!' appending super + '!' end end