aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Typo fix [ci ski]Justin2013-03-151-2/+2
| | | | Closes #9730.
* Update CHANGELOGs for 3.2.13.rc1Steve Klabnik2013-03-051-0/+5
|
* Backported #6755 to 3-2-stable. Don't read csv file during executing ↵Narihiro Nakamura2013-02-281-0/+12
| | | | db:fixtures:load.
* Define #inspect instead of #to_sPrem Sichanugrist2013-02-241-2/+2
| | | | Ruby 2.0 Object#inspect does not call #to_s by default anymore.
* Fix failing test case when no database.ymlPrem Sichanugrist2013-02-241-4/+11
|
* `name` should be public.Aaron Patterson2013-02-241-12/+12
|
* Add in missing requiresPrem Sichanugrist2013-02-241-0/+1
|
* Do not put the version in unreleased changes [ci skip]Rafael Mendonça França2013-02-141-1/+1
|
* Fix the CHANGELOG headers [ci skip]Rafael Mendonça França2013-02-141-0/+5
|
* Fix typo in railties changelog [ci skip]Carlos Antonio da Silva2013-02-141-1/+1
| | | | Other changelogs were fixed in f15581b1bab8fa042f4614f9b2709c3c580ad9d1.
* Update changelogs with version/release dates [ci skip]Carlos Antonio da Silva2013-02-111-1/+3
|
* Merge branch '3-2-sec' into 3-2-stableAaron Patterson2013-02-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * bumping versionAaron Patterson2013-02-101-1/+1
| |
* | Fix the TestCase class and make tests pass on ruby 2.0Rafael Mendonça França2013-01-141-2/+2
| |
* | Add regression test to #8907Rafael Mendonça França2013-01-141-0/+31
| |
* | Update changelogs with release date [ci skip]Carlos Antonio da Silva2013-01-091-1/+7
| |
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * bumping versionAaron Patterson2013-01-081-1/+1
| |
* | update directory tree in the generated READMEAkira Matsuda2013-01-041-8/+8
| | | | | | | | [ci skip]
* | Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
|\| | | | | | | Latest released tag was not fully merged into the stable branch (missed version bumping)
| * bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
| |
* | Add release date of 3.2.10Rafael Mendonça França2013-01-021-2/+6
| | | | | | | | Fix format and wrong changelog entry
* | Merge branch '3-2-stable' into 3-2-secmergeAaron Patterson2013-01-025-271/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | removes the Ajax on Rails early draftXavier Noria2012-12-311-267/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | backport #8616, quote column names in generated fixture filesYves Senn2012-12-264-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-231-0/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * updating the changelogsAaron Patterson2012-12-231-0/+2
| |
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-12-231-1/+1
| | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
* | Don't use 1.9 hash syntax on 3-2-stableAndrew White2012-12-141-6/+6
| |
* | Clear url helper methods when routes are reloadedAndrew White2012-12-141-0/+71
| | | | | | | | | | | | | | | | 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.
* | Allow users to choose the timestamp format in the cache keyRafael Mendonça França2012-12-101-0/+2
| | | | | | | | | | | | This can be done using the class attribute cache_timestamp_format Closes #8195
* | Merge pull request #8280 from asanghi/fix_guide_field_with_error_procRafael Mendonça França2012-11-201-2/+6
| | | | | | | | | | | | fix guide with field_with_error proc example [ci skip]
* | backport #8262, require bundler groups to include rake-tasks in enginesYves Senn2012-11-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Remove the git option from ruby-prof gem pointing to wycats repo.Carlos Antonio da Silva2012-11-161-1/+1
| | | | | | | | | | | | | | 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]
* | backport #8139, `plugin new` adds dummy app tasks when necessary. …Yves Senn2012-11-154-2/+17
| | | | | | | | | | | | | | | | | | | | | | The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. Closes #8224 Conflicts: railties/CHANGELOG.md
* | Fixes issue #6251David Padilla2012-11-151-1/+1
| | | | | | | | | | | | | | Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy.
* | Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-133-3/+4
| |
* | Add release date of Rails 3.2.9 to documentationclaudiob2012-11-121-1/+1
| |
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-121-1/+1
|\|
| * Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
| |
| * Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
| | | | | | | | This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
* | Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
| | | | | | | | This reverts commit 552a3e145373cabe25a78d8d7cba2ceaabd9ecc5.
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\|
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
| |
| * Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
| | | | | | | | | | This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146
* | Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
| | | | | | | | | | This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146
* | Merge pull request #8027 from daenney/masterXavier Noria2012-11-081-1/+3
|/ | | | | | | | 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
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
|
* Merge pull request #8009 from graceliu/3-2-fix_database_url_supportRafael Mendonça França2012-10-292-0/+230
|\ | | | | | | fixed support for DATABASE_URL for rake db tasks
| * fixed support for DATABASE_URL for rake db tasksGrace Liu2012-10-292-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 12:50:52 +0000