Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve AR changelog [ci skip] | Carlos Antonio da Silva | 2013-12-05 | 1 | -1/+1 |
| | |||||
* | Use the right type_map | Rafael Mendonça França | 2013-12-05 | 2 | -5/+3 |
| | |||||
* | Merge branch 'av-loading-order' | Rafael Mendonça França | 2013-12-05 | 2 | -5/+19 |
|\ | |||||
| * | Remove the explicit order set for the initializer | Rafael Mendonça França | 2013-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | This will fix the regression added on b068e20b35797aa6deaa377a48c990759734f515. See tests added at ff08d31 to a better understanding about the problem | ||||
| * | Assert the singleton instead of to truthy/falsy | Rafael Mendonça França | 2013-12-05 | 1 | -4/+4 |
| | | | | | | | | | | This will avoid false positives where caching? is nil and should be false | ||||
| * | Add tests to cache_template_loading when an engine loaded Action View | Rafael Mendonça França | 2013-12-05 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | before the application This test is a regression test to b068e20b35797aa6deaa377a48c990759734f515 that changed the load order of Action View initializers. | ||||
* | | Merge pull request #13199 from arunagw/spring-test-only-development | Rafael Mendonça França | 2013-12-05 | 1 | -1/+1 |
|\ \ | | | | | | | Make sure that spring is loaded in development only | ||||
| * | | Make sure that spring is loaded in development only | Arun Agrawal | 2013-12-05 | 1 | -1/+1 |
| |/ | |||||
* / | Remove deprecated call to Relation#all | Carlos Antonio da Silva | 2013-12-05 | 1 | -1/+1 |
|/ | |||||
* | Using 2.3.11 URL for 2.3.x guides [ci skip] | Arun Agrawal | 2013-12-05 | 1 | -1/+1 |
| | |||||
* | Merge pull request #13189 from strzalek/retain-ap-av-dep | Jeremy Kemper | 2013-12-05 | 10 | -33/+8 |
|\ | | | | | Retain ActionPack dependency on ActionView. Fixes #12979. | ||||
| * | Remove missing integration points of AV extraction | Carlos Antonio da Silva | 2013-12-05 | 3 | -5/+1 |
| | | |||||
| * | Include AV::Layouts directly in AM::Base | Łukasz Strzałkowski | 2013-12-05 | 2 | -6/+2 |
| | | | | | | | | No need to do this in railtie as AM depends on AV either way | ||||
| * | Retain ActionPack dependency on ActionView | Łukasz Strzałkowski | 2013-12-05 | 6 | -22/+5 |
| | | |||||
* | | Merge pull request #12646 from severin/polymorphic_belongs_to_touch | Yves Senn | 2013-12-05 | 3 | -17/+63 |
|\ \ | | | | | | | polymorphic belongs_to association with touch: true updates old record correctly | ||||
| * | | polymorphic belongs_to association with touch: true updates old record correctly | Severin Schoepke | 2013-12-05 | 3 | -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_first | Carlos Antonio da Silva | 2013-12-05 | 3 | -0/+21 |
|\ \ | | | | | | | Set `i18n.enforce_available_locales` before any other configuration option. | ||||
| * | | set `i18n.enforce_available_locales` before `i18n.default_locale`. | Yves Senn | 2013-12-05 | 3 | -0/+21 |
|/ / | |||||
* | | add missing CHANGELOG entry for d8c6f52. [ci skip] | Yves Senn | 2013-12-05 | 2 | -0/+8 |
| | | | | | | | | Discoverd by #13175. | ||||
* | | end sentences with a `.`. [ci skip] | Yves Senn | 2013-12-05 | 3 | -12/+14 |
| | | |||||
* | | Merge pull request #13185 from Jashank/patch-1 | Jeremy Kemper | 2013-12-04 | 1 | -1/+1 |
|\ \ | | | | | | | docs: Replace an unpleasant grammatical construct. | ||||
| * | | Rails on Rack: Replace an unpleasant grammatical construct. | Jashank Jeremy | 2013-12-05 | 1 | -1/+1 |
|/ / | | | | | [ci skip] | ||||
* | | 2.1.0 is fine | Rafael Mendonça França | 2013-12-05 | 1 | -1/+0 |
| | | |||||
* | | Use the released arel gem | Rafael Mendonça França | 2013-12-05 | 2 | -2/+1 |
| | | |||||
* | | Merge pull request #12995 from rails/application-verifier | Rafael Mendonça França | 2013-12-04 | 4 | -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ça | 2013-12-04 | 1 | -0/+11 |
| | | | |||||
| * | | Make salt argument required for message verifier | Rafael Mendonça França | 2013-12-04 | 3 | -13/+13 |
| | | | |||||
| * | | Fix typos | Rafael Mendonça França | 2013-12-04 | 2 | -3/+3 |
| | | | |||||
| * | | Test if two different verifiers don't share the same secret | Rafael Mendonça França | 2013-12-04 | 1 | -2/+12 |
| | | | |||||
| * | | Update the releases notes | Rafael Mendonça França | 2013-12-04 | 1 | -0/+1 |
| | | | |||||
| * | | Don't need to use a controller to test the verifier | Rafael Mendonça França | 2013-12-04 | 1 | -9/+3 |
| | | | |||||
| * | | No need to configure salts | Rafael Mendonça França | 2013-12-04 | 3 | -34/+7 |
| | | | |||||
| * | | Make possibile to get different message verifiers | Rafael Mendonça França | 2013-12-04 | 3 | -10/+37 |
| | | | |||||
| * | | Add missing require | Rafael Mendonça França | 2013-12-04 | 1 | -0/+1 |
| | | | |||||
| * | | Rename verifier to message_verifier | Rafael Mendonça França | 2013-12-04 | 3 | -10/+10 |
| | | | |||||
| * | | Add documentation and CHANGELOG entry to Application#verifier | Rafael Mendonça França | 2013-12-04 | 2 | -0/+21 |
| | | | |||||
| * | | Add application verifier | Rafael Mendonça França | 2013-12-04 | 2 | -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 #13182 | Aaron Patterson | 2013-12-04 | 2 | -12/+17 |
| | | |||||
* | | Merge pull request #13183 from sorah/never_ignore_i18n_translate_raise_option | Carlos Antonio da Silva | 2013-12-04 | 3 | -1/+22 |
|\ \ | | | | | | | Escalate missing error when :raise is true in translate helper, fix regression introduced by security fix. | ||||
| * | | Escalate missing error when :raise is true | Shota Fukumori (sora_h) | 2013-12-05 | 3 | -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 too | Santiago Pastorino | 2013-12-04 | 1 | -0/+2 |
| | | |||||
* | | Update changelog [ci skip] | Rafael Mendonça França | 2013-12-04 | 1 | -2/+2 |
| | | |||||
* | | Update guides welcome page to point to version 3.2.16 [ci skip] | Arun Agrawal | 2013-12-04 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #13177 from kuldeepaggarwal/doc-upgrade | Rafael Mendonça França | 2013-12-04 | 1 | -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 Aggarwal | 2013-12-05 | 1 | -2/+2 |
| | | | |||||
* | | | Review json_escape docs [ci skip] | Carlos Antonio da Silva | 2013-12-04 | 1 | -22/+22 |
|/ / | |||||
* | | Merge pull request #13073 from chancancode/json_escape | Jeremy Kemper | 2013-12-04 | 3 | -14/+107 |
|\ \ | | | | | | | Fixed json_escape (again) | ||||
| * | | Also move html_esacpe regex to a constant (see 9d25af60) | Godfrey Chan | 2013-12-04 | 1 | -1/+2 |
| | | | |||||
| * | | Added \u2028 \u2029 to json_escape | Godfrey Chan | 2013-12-04 | 3 | -6/+12 |
| | | | |||||
| * | | Use lower case letters in unicodes sequences to match the new encoder's output | Godfrey Chan | 2013-12-04 | 2 | -4/+4 |
| | | |