| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
|\ |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing
changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd.
Reason: This broke the build
https://travis-ci.org/rails/rails/jobs/6629894
|
| |
| |
| |
| |
| |
| |
| |
| | |
ActionView::Digestor now passes arguments correctly to
LookupContext::find method. This makes cache digests
respect the format option correctly.
FixtureFinder in tests also changed to reflect this.
|
|\ \
| | |
| | | |
symbolize_keys => symbolize_keys! on new hash; change sentence
|
| | |
| | |
| | |
| | | |
"There're" => There are for better readability
|
|/ /
| |
| |
| | |
renderer is clearer.
|
|\ \
| |/
|/| |
options_from_collection_for_select helper takes html attributes
|
| |
| |
| |
| | |
as the last element of the array
|
| | |
|
|\ \
| |/
|/|
| |
| | |
Conflicts:
guides/source/action_mailer_basics.md
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
clarify issue #10115. Also made the field_helpers an explicit list of
methods.
|
| | |
|
|\ \
| | |
| | | |
Optimize generated ERB to reduce method calls
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
before:
');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat('
');@output_buffer.safe_concat(' ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat('
');@output_buffer.safe_concat(' </td>
<td class="content">
');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat('
');@output_buffer.safe_concat(' </td>
<td class="message">
');
after:
';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append='
';@output_buffer.append=( spinner_img );@output_buffer.safe_append='
</td>
<td class="content">
';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append='
</td>
<td class="message">
';
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If a file field tag is passed the multiple option, it is turned into an
array field (appending "[]"), but if the file field is passed an
explicit name as an option, leave the name alone (do not append "[]").
Fixes #9830
|
| | |
| | |
| | |
| | |
| | |
| | | |
There's no need to use Hash#merge with a new hash just for setting the
href option to pass it through. Since we're always dealing with a new
html_options hash, we're free to just set the value instead.
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Add changelog entry
Delete changelog
|
| | | |
|
|\ \ \
| | | |
| | | | |
Revert grep to select since they are not the same
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
A previous commit swapped out a call to select for a call to grep in
time_zone_options_for_select. This behavior actually causes the
regexp priority option to stop working.
ActiveSupport::TimeZone overrides the =~ operator which is what the
select block was using previously. Enumerable#grep
checks pattern === element and in this case that would be /US/ ===
ActiveSupport::TimeZone which does not work because
ActiveSupport::TimeZone does not supply an implicit converting to_str
method, only an explicit to_s method.
It would be impossible to provide a to_str method that behaves
identically to the =~ method provided on ActiveSupport::TimeZone
so the only option is to revert back to using select with =~.
|
|\ \ \ \
| | | | |
| | | | | |
remove unused variable and assignment
|
| | |_|/
| |/| | |
|
|/ / / |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
activerecord/test/cases/adapter_test.rb
guides/source/testing.md
[ci skip]
|
| | | |
|
| | |
| | |
| | |
| | | |
there are just the same description about accepts_nested_attributes [ci skip]
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* master-sec:
fix protocol checking in sanitization [CVE-2013-1857]
JDOM XXE Protection [CVE-2013-1856]
fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
stop calling to_sym when building arel nodes [CVE-2013-1854]
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | | |
i18n locale fallback for localized views
|
| | |/ /
| |/| | |
|
|\ \ \ \
| | | | |
| | | | | |
Fix rake test warnings in actionpack
|
| |/ / / |
|
|/ / / |
|
|\ \ \ |
|
| |/ /
| | |
| | | |
if there's content for the right column, then we need the two-column class, if not the one-column
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If an explicit name has been given and it already ends with "[]"
Before:
select(:category, [], {}, multiple: true, name: "post[category][]")
# => <select name="post[category][][]" ...>
After:
select(:category, [], {}, multiple: true, name: "post[category][]")
# => <select name="post[category][]" ...>
|