| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | |
| | |
| | | |
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][]" ...>
|
| | | |
|
|\ \ \
| | | |
| | | | |
Allow use of assert_template with the :file option.
|
| | |/
| |/|
| | |
| | | |
This worked in Rails 3.2, but was a regression in 4.0.0.beta1
|
| | | |
|
| |/
|/| |
|
| | |
|
|/ |
|
|\
| |
| | |
Fix for #9360 content_for regression
|
| | |
|
| | |
|
|\ \
| | |
| | | |
Custom dependency trackers for the template digestor
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | | |
The debug helper should inspect the object when it can't be converted to YAML, this behavior was changed in 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534.
|
|\ \ \
| | | |
| | | | |
use ISO 8601 format in time_tag helper
|
| | | | |
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Before `time_tag Date.today` will return `<time
datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`.
This commit fixes time_tag helper to use RFC-3339 full-date format
(Y-m-d) in datetime attribute.
|
| | | |
|
| |/
|/|
| |
| | |
This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
|
| | |
|
| |
| |
| |
| | |
It's faster, and doesn't force us to dup the timezones array.
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing
changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7.
This was causing issues in one of our apps we just upgraded.
ActionController::RoutingError: No route matches [GET]
"/images/favicon.ico"
favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned
'/favicon.ico'
Browsers by default look for favicon.ico in the root directory
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_view/helpers/asset_tag_helper.rb
|
|
|
|
|
|
|
|
|
|
| |
Previous implementation of time_zone_options_for_select did not dup the
ActiveSupport::TimeZone.all array. When :priority_zones were provided
the method would reject! the zones from the memoized TimeZones array
thus affecting future requests to the server. Essentially whatever
zones were specified as :priority_zones would show up for the first
request but then disappear from the time zone options on future
requests.
|
|\
| |
| |
| |
| | |
Conflicts:
guides/source/upgrading_ruby_on_rails.md
|
| |
| |
| |
| |
| |
| | |
The `:prefix` bullet content was not properly wrapping,
dropping to the following line because the additional
content was not indented properly. With this change, it
will now display properly the way `:discard_type` does.
|