| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Similarly to 6525002, this allows to use routes helpers for mounted
helpers, but this time in ActionView::TestCase
|
|
|
|
| |
Correct the use of to_model in polymorphic routing
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|\
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| |
| |
| | |
Thanks to Ben Murphy for reporting this!
CVE-2012-2660
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
Add some tests for link_to with blocks and escaping content.
|
| | |
|
| |
| |
| |
| | |
Prefer Hash#[]= over Hash#merge when setting a value.
|
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>"
|
|\ \ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | | |
Refactor number helpers output with safety handling to call float
parsing only once. Also remove 'erb' require.
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
appfolio/moving_number_helper_methods_to_active_support
Moving number helper from ActionView to Active Support
|
| |/ / |
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When more than one directory for helpers is provided to a controller, it
should preserver the order of directories. Given 2 paths:
MyController.helpers_paths = ["dir1/helpers", "dir2/helpers"]
helpers from dir1 should be loaded first. Before this commit, all
helpers were mixed and then sorted alphabetically, which essentially
would require to rename helpers to get desired order.
This is a problem especially for engines, where you would like to be
able to predict accurately which engine helpers will load first.
(closes #6496)
|
| |
| |
| |
| | |
This options can be used to not escape the result by default.
|
| | |
|
| |
| |
| |
| | |
Refactoring the truncate method to not do a sort-circuit return
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
rails helpers.
This way if my text is long I don't have to do something like this:
.text
= truncate(@text, :length => 27)
if @text.size >= 27
= link_to "continue", notes_path, ....."")
|
|\ \ |
|
| | | |
|
|/ / |
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.
Reason: Not a fan of such massive changes. We usually close such changes
if made to Rails master as a pull request. Following the same principle
here and reverting.
[ci skip]
|
| | | |
|
| | |
| | |
| | |
| | | |
anything.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace
with the first match, and voilà! Note that the regex matches a little bit too
much, so you probably want to `git add -i .` and go through every single diff
to check if it actually should be changed.
|
| | | |
|
|\ \ \
| | | |
| | | | |
Added session.keys and session.values back to ActionDispatch::Request::Session
|
| | | |
| | | |
| | | |
| | | | |
ActionDispatch::Request::Session#values
|
|/ / / |
|
|\ \ \
| | | |
| | | | |
Add HTML5 color and date/time inputs
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The input types added are:
- input[type="month"]
- input[type="week"]
- input[type="datetime"]
- input[type="datetime-local"]
|
| | | | |
|
| |_|/
|/| |
| | |
| | |
| | | |
* Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults
* Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure.
|
|\ \ \
| | | |
| | | | |
Fix bug when Rails.application is defined but is nil. See #881
|
| | | | |
|
|/ / / |
|
| | |
| | |
| | |
| | |
| | | |
This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing
changes made to 513a0525c24c2944630acfa465b22cd2f4601adf.
|
|\ \ \
| |/ /
|/| | |
Resolver concurrency fix
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In order to avoid holding a global lock when doing template
resolution, instead add individual locks on a per cache entry
basis. The global lock is now only used for manipulation of the main
cache data structure.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Template cache in the Resolver can be accessed by multiple threads
similtaneously in multi-threaded environments. The cache is implemented
using a Hash, which isn't threadsafe in all VMs (notably JRuby).
This commit extracts the cache to a new Cache class and adds mutexes to
prevent concurrent access.
|
|\ \ \
| | | |
| | | | |
When a route references a missing controller, raise ActionController::RoutingError with clearer message
|
| | | |
| | | |
| | | |
| | | | |
ActionController::RoutingError with a clearer message
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Template concurrency fixes
Conflicts:
actionpack/lib/action_view/template.rb
|