| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a 3-2-stable backport for #6420 which was merged into master.
Currently, when saving a frozen record, an exception would be thrown
which causes a rollback. However, there is a bug in active record that
"defrost" the record as a side effect:
>> t = Topic.new
=> #<Topic id: nil, ...>
>> t.freeze
=> #<Topic id: nil, ...>
>> t.save
RuntimeError: can't modify a frozen Hash
>> t.frozen?
=> false
>> t.save
=> true
This patch fixes the bug by explictly restoring the frozen state on the
attributes Hash after every rollback.
|
| |
|
|
|
|
|
| |
Using require in development mode will prevent required files from
reloading, even if they're changed. In order to keep namespaced
application_controller reloadable, we need to use require_dependency
instead of require.
|
| |\
| |
| | |
Postgresql doesn't accept limits on binary (bytea) columns (for 3-2-stable)
|
| | | |
|
| |\ \
| | |
| | | |
assets: don't add extension if other given and file exists
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We should lookup if asset without appended extension exists.
When sprockets are disabled the asset tag helpers incorporate
this logic. When sprockets are enabled we should have the same
logic.
For example, we have style.ext file in app/assets/stylesheets and
we use stylesheet_link_tag in the layout. In this case we should
have /assets/style.ext instead of /assets/style.ext.css in the
output.
Closes #6310
|
| |/
|
|
|
|
|
|
|
| |
Add more info on how to write a good commit messages along with
example showing nicely formatted commit message.
Rails git history does not look too well when you try to figure out why
particular changes were introduced. We can do much better than that and
it's never too late to start.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In development mode, dependencies are loaded dynamically at runtime,
using `const_missing`. Because of that, when one of the constants is
already loaded and `const_missing` is not triggered, user can end up
with unexpected results.
Given such file in an Engine:
```ruby
module Blog
class PostsController < ApplicationController
end
end
```
If you load it first, before loading any application files, it will
correctly load `Blog::ApplicationController`, because second line will
hit `const_missing`. However if you load `ApplicationController` first,
the constant will be loaded already, `const_missing` hook will not be
fired and in result `PostsController` will inherit from
`ApplicationController` instead of `Blog::ApplicationController`.
Since it can't be fixed in `AS::Dependencies`, the easiest fix is to
just explicitly load application controller.
closes #6413
|
| |\
| |
| | |
TagHelper creates invalid data attributes when value is a BigDecimal
|
| | | |
|
| |\ \
| |/
|/| |
Template concurrency fixes
|
| | | |
|
| | |
| |
| |
| | |
[ci skip] closes #5790
|
| | |
| |
| |
| |
| | |
MySQL's adapter was changing value for case sensitive comparison. We
don't need to do it for `nil`.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Closes (#5853)
Uniqueness validator was not properly checking if there are any existing
records, when value was `nil` and column was text type. `nil` was
converted to string, which resulted in queries looking like:
```sql
SELECT 1 FROM "posts" WHERE "posts"."title" = '' LIMIT 1
```
instead of
```sql
SELECT 1 FROM "posts" WHERE "posts"."title" IS NULL LIMIT 1
```
|
| | |
| |
| |
| |
| |
| |
| | |
`excerpt` text helper uses `:radius`, not `line_width` (that is used by
`word_wrap` helper).
Also cleanup some whitespaces.
|
| | |
| |
| |
| | |
Synchronize read and modification of @reserved_connections
|
| | |
| |
| |
| |
| |
| |
| |
| | |
The fix commited in e2a070c was returning the `new_target`, as
a try to return whatever user replaced association with. The
problem is, the resulting association target may be ordered
differently. In such case we want to return the target that
will be later used for that association.
|
| | |
| |
| |
| | |
Render img tag with empty src if empty string is passed to image_tag.
|
| |\ \
| | |
| | | |
Invalid ruby18 syntax in habtm
|
| |/ / |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Bug #6289
Conflicts:
activerecord/test/cases/associations/has_many_associations_test.rb
|
| |\ \
| | |
| | | |
Deprecate old APIs for highlight, excerpt and word_wrap
|
| |/ / |
|
| |\ \
| | |
| | | |
Fix validators docs [3-2-stable]
|
| |/ / |
|
| | |
| |
| |
| |
| |
| | |
Conflicts:
activerecord/test/cases/associations/has_many_associations_test.rb
|
| |\ \
| | |
| | | |
Changing the indentation level of the block comment close for Sass
|
| |/ /
| |
| | |
If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
|
| |\ \
| | |
| | | |
Backport dup validation 3 2
|
| |/ / |
|
| | | |
|
| |\ \
| | |
| | | |
Dup validation 3 2
|
| |/ /
| |
| |
| |
| |
| | |
3-2-stable
It Fixes #5953 in 3-2-stable, it's the same pull request of #6284
|
| |\ \
| | |
| | | |
Backporting docs
|
| |/ / |
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
`button_to` and `submit_tag` helpers.
|
| | |
| |
| |
| | |
mailer can be anonymous
|
| | | |
|
| | |
| |
| |
| | |
Signed-off-by: José Valim <jose.valim@gmail.com>
|
| |\ \
| | |
| | | |
Remove unused private method
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
Support data: url scheme
|
| |\ \ \
| | | |
| | | | |
3 2 stable guide fix [ci skip]
|
| | | | | |
|
| |\ \ \ \
| |/ / /
|/| | | |
Upgrade sprockets to 2.1.3
|
