Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6752 from steveklabnik/fix_5680 | Rafael Mendonça França | 2012-06-16 | 1 | -1/+7 |
|\ | | | | | Respect absolute paths in compute_source_path. | ||||
| * | Respect absolute paths in compute_source_path. | Steve Klabnik | 2012-06-16 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using compute_source_path to determine the full path of an asset, if our source begins with '/', we don't want to include the directory. Examples are illustrative: > compute_source_path("foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/stylesheets/foo.css" > compute_source_path("/foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/foo.css" Before this patch, the second example would return the same as the first. Fixes #5680. | ||||
* | | TestCase does not need to be loaded when loading the framework | Aaron Patterson | 2012-06-15 | 1 | -1/+3 |
| | | |||||
* | | Support unicode character route in config/routes.rb. | kennyj | 2012-06-16 | 2 | -1/+8 |
|/ | |||||
* | Use status, content_type, body method signature for render too | Santiago Pastorino | 2012-06-14 | 1 | -4/+3 |
| | |||||
* | Refactor public exceptions to reuse render format method | Carlos Antonio da Silva | 2012-06-14 | 1 | -9/+6 |
| | |||||
* | Revert "AV::TestCase does not need to be loaded when eagerly loading the" | Aaron Patterson | 2012-06-14 | 1 | -2/+1 |
| | | | | This reverts commit f5e7cb84cd377feb1b60c5356ce02123e9c94380. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-06-14 | 2 | -8/+26 |
|\ | |||||
| * | moar copy edits [ci skip] | Vijay Dev | 2012-06-14 | 1 | -2/+1 |
| | | |||||
| * | copy editing [ci skip] | Vijay Dev | 2012-06-14 | 1 | -4/+7 |
| | | |||||
| * | fixed http token authentication formatting | Jakub Kuźma | 2012-06-12 | 1 | -8/+13 |
| | | |||||
| * | on CSRF whitelisting the argument for :if must be a symbol | Daniel Lopes | 2012-06-07 | 1 | -1/+1 |
| | | |||||
| * | fix typos on the CSRF whitelisting doc | Daniel Lopes | 2012-06-07 | 1 | -3/+3 |
| | | |||||
| * | Document the CSRF whitelisting on get requests | Daniel Lopes | 2012-06-07 | 1 | -5/+16 |
| | | |||||
* | | AV::TestCase does not need to be loaded when eagerly loading the | Aaron Patterson | 2012-06-14 | 1 | -1/+2 |
| | | | | | | | | framework | ||||
* | | i suck, fixing error message | Aaron Patterson | 2012-06-14 | 1 | -1/+1 |
| | | |||||
* | | Wrap up missing helper exceptions | Aaron Patterson | 2012-06-14 | 1 | -2/+10 |
| | | | | | | | | | | | | | | The `path` method on missing helper errors is inconsistent with the implementation on LoadError in Ruby 2.0. Wrap up the missing helper exceptions so that the inconsistent behavior is mirrored in Ruby 2.0 (until we can figure out *why* it's inconsistent). | ||||
* | | using hax to fix tests on Ruby 2.0 | Aaron Patterson | 2012-06-13 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #6721 from homakov/patch-2 | Santiago Pastorino | 2012-06-13 | 1 | -3/+0 |
|\ \ | | | | | | | These lines don't help to mitigate CVE. They only turn [nil] into nil, w... | ||||
| * | | These lines don't help to mitigate CVE. They only turn [nil] into nil, w/o ↵ | Egor Homakov | 2012-06-13 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | them [nil] turns into [] and that is quite innocent. generated SQL - `IN (NULL)` compact! did all the job. | ||||
* | | | ActionController::Caching depends on RackDelegation and ↵ | Santiago Pastorino | 2012-06-13 | 1 | -0/+3 |
|/ / | | | | | | | AbstractController::Callbacks | ||||
* | | Merge branch 'master-sec' | Aaron Patterson | 2012-06-12 | 1 | -2/+4 |
|\ \ | | | | | | | | | | | | | * master-sec: Array parameters should not contain nil values. | ||||
| * | | Array parameters should not contain nil values. | Aaron Patterson | 2012-06-12 | 1 | -2/+4 |
| | | | |||||
* | | | content_type is already a Mime::Type object | Santiago Pastorino | 2012-06-12 | 1 | -1/+1 |
| | | | |||||
* | | | This consider_all_requests_local doesn't make sense | Santiago Pastorino | 2012-06-12 | 1 | -3/+2 |
|/ / | | | | | | | | | This middleware is only for Public Exceptions. This follows bd8c0b8a | ||||
* | | Return proper format on exceptions | Santiago Pastorino | 2012-06-11 | 1 | -14/+36 |
| | | |||||
* | | both string and sumbol will be interpolated as string no need to convert to_s | ganesh | 2012-06-11 | 1 | -3/+3 |
| | | |||||
* | | Symbol responds_to :upcase & :downcase in Ruby >= 1.9 | Akira Matsuda | 2012-06-06 | 2 | -4/+4 |
| | | |||||
* | | One-liner code for logger in ActionView::Helpers::ControllerHelper | Dmitry Vorotilin | 2012-06-05 | 1 | -5/+1 |
| | | |||||
* | | Merge pull request #6631 from yuki24/use_block_in_button_helper | José Valim | 2012-06-05 | 1 | -2/+13 |
|\ \ | | | | | | | Accept a block in FormHelper#button | ||||
| * | | accept a block in button helper. | Yuki Nishijima | 2012-06-05 | 1 | -2/+13 |
| |/ | |||||
* / | Metal controller doesn't have logger method, check it and then delegate | Dmitry Vorotilin | 2012-06-05 | 1 | -2/+8 |
|/ | |||||
* | Allow to use mounted helpers in ActionView::TestCase | Piotr Sarnacki | 2012-06-01 | 1 | -1/+2 |
| | | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase | ||||
* | Merge pull request #6588 from nbibler/polymorphic_to_model | José Valim | 2012-06-01 | 1 | -1/+7 |
| | | | | Correct the use of to_model in polymorphic routing | ||||
* | Include routes.mounted_helpers into integration tests | Piotr Sarnacki | 2012-06-01 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573) | ||||
* | Merge branch 'master-sec' | Aaron Patterson | 2012-05-31 | 1 | -0/+22 |
|\ | | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this | ||||
| * | Strip [nil] from parameters hash. | Aaron Patterson | 2012-05-30 | 1 | -0/+22 |
| | | | | | | | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660 | ||||
| * | Fix the build | Santiago Pastorino | 2012-05-22 | 1 | -1/+0 |
| | | |||||
| * | require active_support/lazy_load_hooks where is needed | Santiago Pastorino | 2012-05-22 | 1 | -0/+1 |
| | | |||||
* | | Extracted redirect logic from ActionController::Force::ClassMethods.force_ssl | Jeremy Friesen | 2012-05-31 | 1 | -7/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch the existing .force_ssl method handles both defining the filter and handling the logic for performing the redirect. With this patch the logic for redirecting to the HTTPS protocol is separated from the filter logic that determines if a redirect should occur. By separating the two levels of behavior, an instance method for ActionController (i.e. #force_ssl_redirect) is exposed and available for more granular SSL enforcement. Cleaned up indentation. | ||||
* | | Simplify link_to using content_tag | Carlos Antonio da Silva | 2012-05-31 | 1 | -12/+6 |
| | | | | | | | | Add some tests for link_to with blocks and escaping content. | ||||
* | | Make link_to arguments explicit | Carlos Antonio da Silva | 2012-05-31 | 1 | -8/+4 |
| | | |||||
* | | Make button_to arguments explicit and refactor a bit | Carlos Antonio da Silva | 2012-05-31 | 1 | -10/+6 |
| | | | | | | | | Prefer Hash#[]= over Hash#merge when setting a value. | ||||
* | | Simplify logic to initialize valid conditions in RouteSet | Carlos Antonio da Silva | 2012-05-31 | 1 | -7/+3 |
| | | | | | | | | | | | | Remove :to_sym call from public_instance_methods iteration, as such methods in Ruby 1.9 already return symbols. Initialize valid conditions with controller/action instead of setting them afterwards. | ||||
* | | accept a block in button_to helper | Sergey Nartimov | 2012-05-30 | 1 | -3/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make possible to use a block in button_to helper if button text is hard to fit into the name parameter, e.g.: <%= button_to [:make_happy, @user] do %> Make happy <strong><%= @user.name %></strong> <% end %> # => "<form method="post" action="/users/1/make_happy" class="button_to"> # <div> # <button type="submit"> # Make happy <strong>Name</strong> # </button> # </div> # </form>" | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-30 | 1 | -1/+1 |
|\ \ | |||||
| * | | fix typo in render_template [ci skip] | Brent Vatne | 2012-05-29 | 1 | -1/+1 |
| | | | |||||
* | | | Review requires from number helper | Carlos Antonio da Silva | 2012-05-28 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Some of these requires are now only necessary in ActiveSupport::NumberHelper. Add hash/keys require due to symbolize_keys usage in number helpers. Also remove some whitespaces. Closes #6414 | ||||
* | | | Parse float value only once in number helpers | Carlos Antonio da Silva | 2012-05-28 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | Refactor number helpers output with safety handling to call float parsing only once. Also remove 'erb' require. | ||||
* | | | Merge pull request #6315 from ↵ | José Valim | 2012-05-28 | 2 | -285/+38 |
|\ \ \ | | | | | | | | | | | | | | | | | appfolio/moving_number_helper_methods_to_active_support Moving number helper from ActionView to Active Support |