| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
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.
|
| | |
|
|\ \
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Template concurrency fixes
Conflicts:
actionpack/lib/action_view/template.rb
|
| |/
|/| |
|
|\ \ |
|
| | | |
|
| | |
| | |
| | |
| | | |
one, added blank hash before that in the args list
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make the method API more clear by explicitly showing the expected
arguments. This means that the options cannot be passed as second
argument because we are not relying on extract_options! anymore,
you are expected to give a selected key or `nil` if you want to pass
options, as it is the last argument.
Notice that this does not change the current method arguments contract
available in 3.2, it just brings back the same functionality with the
divider addition.
|
|\ \ \
| | | |
| | | | |
Tidied and standardised text_helper implementations.
|
| | | | |
|
|/ / /
| | |
| | |
| | | |
escaping of delimiters and separators
|
|\ \ \
| | | |
| | | | |
Render img tag with empty src if empty string is passed to image_tag.
|
| | |/
| |/| |
|
|/ / |
|
| | |
|
|\ \
| | |
| | | |
TagHelper creates invalid data attributes when value is a BigDecimal
|
| |/ |
|
|\ \
| |/
|/| |
Created a Raw handler for templates.
|
| |
| |
| |
| | |
Fixes #2394
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
activerecord/lib/active_record/core.rb
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Greenie0506/add_separator_to_grouped_options_for_select
Add separator option to grouped_options_for_select
|
| | | |
| | | |
| | | |
| | | | |
Change prompt to options hash in grouped_options_for_select
|
|\ \ \ \
| |/ / /
|/| | | |
Feature/simple format refactoring
|
| | | | |
|
| | |/
| |/|
| | |
| | |
| | | |
using split_paragraphs method and content_tag instead of string
concatination
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
option from `submit_tag`, `button_tag` and `button_to` helpers.""
Finally remove `:disable_with` but use `:data => { :disable_with => ... }`
in examples to show off a better API (which looks nicer in Ruby 1.9)
This reverts commit a5c38a9c087e33d36397afc496be7c8e01b37ef0.
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
`submit_tag`, `button_tag` and `button_to` helpers."
`disable_with:` is much easier to type than `"data-disable-with" =>`,
and the fact it uses "data-disable-with" => is an implementation concern,
it should not affect the public API.
This reverts commit 683fc4db00f496e5225928afb4d4e932e0fcdc48.
|