Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Fixed a long-standing bug in `json_escape` that strips quotation marks | Godfrey Chan | 2013-12-04 | 2 | -12/+53 |
| | | |||||
| * | Added failing test for json_escape striping quotation marks | Godfrey Chan | 2013-12-04 | 1 | -0/+45 |
|/ | | | | Expanded test coverage for html_escape and json_escape | ||||
* | Merge pull request #13171 from kuldeepaggarwal/test-case-updation | Rafael Mendonça França | 2013-12-04 | 1 | -1/+0 |
|\ | | | | | removed duplicate test case | ||||
| * | removed duplicate test case | Kuldeep Aggarwal | 2013-12-04 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #13170 from acapilleri/remove_return_nil | Rafael Mendonça França | 2013-12-04 | 1 | -3/+1 |
|\ \ | |/ |/| | remove nil in NullType#ref. | ||||
| * | remove nil in NullType#ref. | Angelo capilleri | 2013-12-04 | 1 | -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 Senn | 2013-12-04 | 1 | -0/+23 |
|/ | |||||
* | Merge pull request #13167 from fluxusfrequency/patch-3 | Carlos Antonio da Silva | 2013-12-04 | 1 | -13/+17 |
|\ | | | | | Formatting, capitalization, and punctuation fixes [ci skip] | ||||
| * | Formatting, capitalization, and punctuation fixes [ci skip] | Ben Lewis | 2013-12-04 | 1 | -13/+17 |
|/ | | | Second try on this commit. | ||||
* | Merge pull request #13152 from mariovisic/text_helper_missing_raw_method | Carlos Antonio da Silva | 2013-12-04 | 2 | -0/+7 |
|\ | | | | | TextHelper#simple_format attempts to call undefined raw method | ||||
| * | Fix issue where TextHelper#simple_format was calling missing 'raw' method | Mario Visic | 2013-12-05 | 2 | -0/+7 |
| | | |||||
* | | Merge pull request #12403 from thedarkone/attr-method-missing-fix | Rafael Mendonça França | 2013-12-04 | 2 | -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. | thedarkone | 2013-09-29 | 2 | -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 | ||||
* | | Fix documentation of number_to_currency helper | Rafael Mendonça França | 2013-12-04 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Now users have to explicit mark the unit as safe if they trust it. Closes #13161 Conflicts: actionpack/lib/action_view/helpers/number_helper.rb actionpack/test/template/number_helper_i18n_test.rb | ||||
* | | remove variants paragraph indent in release notes. [ci skip] | Yves Senn | 2013-12-04 | 1 | -23/+24 |
| | | |||||
* | | add Spring as major feature in the 4.1 release notes. [ci skip] | Yves Senn | 2013-12-04 | 2 | -0/+57 |
| | | | | | | | | Follow up to #12958. | ||||
* | | Merge pull request #12958 from jonleighton/spring | Jon Leighton | 2013-12-04 | 5 | -7/+71 |
|\ \ | | | | | | | Install Spring preloader when generating new applications | ||||
| * | | Install Spring preloader when generating new applications | Jon Leighton | 2013-12-03 | 5 | -7/+71 |
| | | | |||||
* | | | minor 4_1_release_notes changes. [ci skip] | Yves Senn | 2013-12-04 | 1 | -22/+11 |
| | | | |||||
* | | | Merge pull request #13109 from chancancode/json_guides | Jeremy Kemper | 2013-12-03 | 3 | -0/+93 |
|\ \ \ | | | | | | | | | Added JSON related items to the 4.1 release notes | ||||
| * | | | Added JSON release notes [ci skip] | Godfrey Chan | 2013-12-03 | 2 | -0/+89 |
| | | | | |||||
| * | | | Backfilled CHANGELOG for AS::JSON::Variable removal (6f3e01e8) [ci skip] | Godfrey Chan | 2013-12-03 | 1 | -0/+4 |
| | | | | |||||
* | | | | Improve a couple exception messages related to variants and mime types | Carlos Antonio da Silva | 2013-12-03 | 3 | -15/+19 |
| | | | | | | | | | | | | | | | | | | | | Avoid one-liner conditionals when they are too big. Avoid concatenating strings to build error messages. Improve messages a bit. | ||||
* | | | | Add nodoc to added VariantFilter class | Carlos Antonio da Silva | 2013-12-03 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge pull request #12977 from strzalek/action-pack-variants | Jeremy Kemper | 2013-12-03 | 16 | -18/+227 |
|\ \ \ | | | | | | | | | Action Pack Variants | ||||
| * | | | Add variants to release notes | Łukasz Strzałkowski | 2013-12-04 | 1 | -0/+33 |
| | | | | |||||
| * | | | Action Pack Variants | Łukasz Strzałkowski | 2013-12-04 | 15 | -18/+194 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, variants in the templates will be picked up if a variant is set and there's a match. The format will be: app/views/projects/show.html.erb app/views/projects/show.html+tablet.erb app/views/projects/show.html+phone.erb If request.variant = :tablet is set, we'll automatically be rendering the html+tablet template. In the controller, we can also tailer to the variants with this syntax: class ProjectsController < ActionController::Base def show respond_to do |format| format.html do |html| @stars = @project.stars html.tablet { @notifications = @project.notifications } html.phone { @chat_heads = @project.chat_heads } end format.js format.atom end end end The variant itself is nil by default, but can be set in before filters, like so: class ApplicationController < ActionController::Base before_action do if request.user_agent =~ /iPad/ request.variant = :tablet end end end This is modeled loosely on custom mime types, but it's specifically not intended to be used together. If you're going to make a custom mime type, you don't need a variant. Variants are for variations on a single mime types. | ||||
* / / | optimize string literals in erb templates | Aaron Patterson | 2013-12-03 | 1 | -2/+2 |
|/ / | |||||
* | | Remove earlier return in favor of conditional | Carlos Antonio da Silva | 2013-12-03 | 1 | -6/+9 |
| | | |||||
* | | Change delimiter check order: first check if it is present | Carlos Antonio da Silva | 2013-12-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | This reads a lot better, and we won't need to try start_with? for blank delimiters. Also rename method name to read better. | ||||
* | | Make both conversion methods work similarly | Carlos Antonio da Silva | 2013-12-03 | 1 | -1/+2 |
| | | | | | | | | | | The conversion without area code already changed the passed number in place, so change the other method to do the same. |