| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 3-2-sec:
bumping version
remove ruby-prof
Fix issue with attr_protected where malformed input could circumvent protection
fixing call to columns hash. run the damn tests when you backport!
Bump rack dependency to 1.4.5
Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string
Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric
Conflicts:
Gemfile
activerecord/CHANGELOG.md
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 3-2-sec:
bumping version
CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.
* Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
Avoid Rack security warning no secret provided
Conflicts:
actionpack/CHANGELOG.md
activerecord/CHANGELOG.md
activesupport/CHANGELOG.md
|
| | | |
|
| | |
| | |
| | |
| | | |
[ci skip]
|
|\| |
| | |
| | |
| | | |
Latest released tag was not fully merged into the stable branch (missed version bumping)
|
| | | |
|
| | |
| | |
| | |
| | | |
Fix format and wrong changelog entry
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 3-2-stable:
fix block.arity raise nil error when not given a block to "content_tag_for"
removes the Ajax on Rails early draft
Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present"
backport #8662, charset should not be appended for `head` responses
Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options."
Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options.
backport #8616, quote column names in generated fixture files
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
There was a few attempts at writing this guide, but we
never passed from the work in progress stage. In spite
of not being included in the table of contents, this
draft was still indexed by bots and showed up in searches.
Steve Klabnik has written "Working with JavaScript in Rails"
which is going to be released with Rails 4. So better get
rid of this altogether.
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
railties/CHANGELOG.md
railties/lib/rails/generators/test_unit/model/model_generator.rb
railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
railties/test/generators/model_generator_test.rb
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 3-2-sec:
CVE-2012-5664 options hashes should only be extracted if there are extra parameters
updating changelog
updating the changelogs
updating the changelog for the CVE
Add release date of Rails 3.2.9 to documentation
Conflicts:
actionmailer/CHANGELOG.md
actionpack/CHANGELOG.md
activemodel/CHANGELOG.md
activerecord/CHANGELOG.md
activeresource/CHANGELOG.md
activesupport/CHANGELOG.md
railties/CHANGELOG.md
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
actionpack/CHANGELOG.md
activerecord/CHANGELOG.md
activesupport/CHANGELOG.md
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Clear url helper methods when routes are reloaded by removing the
methods explicitly rather than just clearing the module because it
didn't work properly and could be the source of a memory leak.
Closes #8488.
|
| |
| |
| |
| |
| |
| | |
This can be done using the class attribute cache_timestamp_format
Closes #8195
|
| |
| |
| |
| |
| |
| | |
fix guide with field_with_error proc example
[ci skip]
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you generate a full engine, this will include rake tasks from
your gem under the `app` namespace. For example if you have a dependency
on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec`
Closes #8229
Conflicts:
railties/CHANGELOG.md
|
| |
| |
| |
| |
| |
| |
| | |
According to him, at one point his fork was the one that had the call
stack printer, and it's in the main repo now.
[ci skip]
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The `plugin new` generator always adds the dummy app rake tasks,
when a dummy app was created.
Closes #8224
Conflicts:
railties/CHANGELOG.md
|
| |
| |
| |
| |
| |
| |
| | |
Plugin generator crashes when using the --dummy-path option
Code was assuming the application name in `config/application.rb`
was module Dummy.
|
| | |
|
| | |
|
|\| |
|
| | |
|
| |
| |
| |
| | |
This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
|
| |
| |
| |
| | |
This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
|
|\| |
|
| | |
|
| |
| |
| |
| |
| | |
This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe.
Closes #8146
|
| |
| |
| |
| |
| | |
This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe.
Closes #8146
|
|/
|
|
|
|
|
|
| |
Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error.
Conflicts:
activesupport/CHANGELOG.md
guides/source/active_support_core_extensions.md
|
| |
|
|\
| |
| |
| | |
fixed support for DATABASE_URL for rake db tasks
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Backport for #7521
- added tests to confirm establish_connection uses DATABASE_URL and
Rails.env correctly even when no arguments are passed in.
- updated rake db tasks to support DATABASE_URL, and added tests to
confirm correct behavior for these rake tasks. (Removed
establish_connection call from some tasks since in those cases
the :environment task already made sure the function would be called)
- updated Resolver so that when it resolves the database url, it
removes hash values with empty strings from the config spec (e.g.
to support connection to postgresql when no username is specified).
- updated ResolverTest to use current_adapter? to check the type of
the current adapter.
|
|/ |
|
|
|
|
|
|
|
| |
This reverts commit f7de647f2cd099ecf6434fa4a0db1ec297f1c32d.
We can't deprecate things in stable branches. I didn't not realized that
the pull request was for 3-2-stable
|
| |
|
|
|
|
| |
E.g. don't eager-load app/assets even if app/* has the eager_load flag set.
|
| |
|
|
|
|
|
| |
This will make possible to do a frameworkless initialization since the
the default middleware stack is self contained.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example:
# Tag asset requests so it's easy to filter them from dev logs
config.log_tags = [
-> request { :assets if request.path.starts_with?(config.assets.prefix) },
-> request { request.uuid }
]
# Watch the logs, ignoring asset requests
$ tail -100f log/development.log | grep -v assets
|
| |
|
|
|
|
|
|
|
|
| |
Master branch: Fixed generated whitespace in routes when using namespaced resource.
Merge pull request #7811 from iHiD/resource_generator_routes_master
Fix the build (Broken scaffold routes test)
|
|
|
|
| |
Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
|
|
|
|
| |
Fixes #7799.
|