Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add release dates to documentation [ci skip] | claudiob | 2013-03-18 | 1 | -1/+1 |
| | | | | Set "March 18, 2013" as the release date for 3.2.13 | ||||
* | Merge branch '3-2-13' into 3-2-stable | Aaron Patterson | 2013-03-18 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-13: bumping to 3.2.13 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] Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets bumping to rc2 Revert "Merge pull request #8209 from senny/backport_8176" Freeze columns only once per Result Preparing for 3.2.13.rc1 release Update CHANGELOGs for 3.2.13 release. Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md | ||||
| * | Update CHANGELOGs for 3.2.13 release. | Steve Klabnik | 2013-02-27 | 1 | -0/+5 |
| | | |||||
* | | Update CHANGELOGs for 3.2.13.rc1 | Steve Klabnik | 2013-03-05 | 1 | -0/+5 |
|/ | |||||
* | Do not put the version in unreleased changes [ci skip] | Rafael Mendonça França | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | Fix the CHANGELOG headers [ci skip] | Rafael Mendonça França | 2013-02-14 | 1 | -0/+5 |
| | |||||
* | Fix typo in railties changelog [ci skip] | Carlos Antonio da Silva | 2013-02-14 | 1 | -1/+1 |
| | | | | Other changelogs were fixed in f15581b1bab8fa042f4614f9b2709c3c580ad9d1. | ||||
* | Update changelogs with version/release dates [ci skip] | Carlos Antonio da Silva | 2013-02-11 | 1 | -1/+3 |
| | |||||
* | Update changelogs with release date [ci skip] | Carlos Antonio da Silva | 2013-01-09 | 1 | -1/+7 |
| | |||||
* | Add release date of 3.2.10 | Rafael Mendonça França | 2013-01-02 | 1 | -2/+6 |
| | | | | Fix format and wrong changelog entry | ||||
* | Merge branch '3-2-stable' into 3-2-secmerge | Aaron Patterson | 2013-01-02 | 1 | -0/+7 |
|\ | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | backport #8616, quote column names in generated fixture files | Yves Senn | 2012-12-26 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | 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-secmerge | Aaron Patterson | 2012-12-23 | 1 | -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 changelogs | Aaron Patterson | 2012-12-23 | 1 | -0/+2 |
| | | |||||
| * | Add release date of Rails 3.2.9 to documentation | claudiob | 2012-12-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md | ||||
| * | Revert "Respect children paths filter settings" | Santiago Pastorino | 2012-11-09 | 1 | -2/+0 |
| | | | | | | | | | | This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146 | ||||
* | | backport #8262, require bundler groups to include rake-tasks in engines | Yves Senn | 2012-11-19 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | backport #8139, `plugin new` adds dummy app tasks when necessary. … | Yves Senn | 2012-11-15 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. Closes #8224 Conflicts: railties/CHANGELOG.md | ||||
* | | Add release date of Rails 3.2.9 to documentation | claudiob | 2012-11-12 | 1 | -1/+1 |
| | | |||||
* | | Revert "Respect children paths filter settings" | Santiago Pastorino | 2012-11-09 | 1 | -2/+0 |
|/ | | | | | This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe. Closes #8146 | ||||
* | Respect children paths filter settings | Elia Schito | 2012-10-28 | 1 | -0/+2 |
| | | | | E.g. don't eager-load app/assets even if app/* has the eager_load flag set. | ||||
* | Update supported ruby versions error message in ruby_version_check.rb | lihan | 2012-10-03 | 1 | -0/+4 |
| | |||||
* | CHANGELOGs are now per branch | Xavier Noria | 2012-08-28 | 1 | -2384/+1 |
| | | | | Check 810a50d for the rationale. | ||||
* | Add release date to CHANGELOGs | Santiago Pastorino | 2012-08-09 | 1 | -1/+1 |
| | |||||
* | Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at | Rafael Mendonça França | 2012-08-02 | 1 | -3/+8 |
| | | | | | | | the ERB scaffold generator. We are trying to teach the data attributes as best practices and `:confirm` will be deprecated in 4.0. | ||||
* | Add missing CHANGELOG entries | Santiago Pastorino | 2012-08-01 | 1 | -2/+6 |
| | | | | [ci skip] | ||||
* | updating release date | Aaron Patterson | 2012-07-26 | 1 | -1/+1 |
| | |||||
* | updating changelogs | Aaron Patterson | 2012-07-23 | 1 | -0/+5 |
| | |||||
* | updating changelogs | Aaron Patterson | 2012-06-12 | 1 | -1/+1 |
| | |||||
* | updating changelogs | Aaron Patterson | 2012-06-11 | 1 | -0/+4 |
| | |||||
* | updating changelogs | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | Add hook for add_resource_route | Santiago Pastorino | 2012-04-18 | 1 | -0/+5 |
| | |||||
* | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 1 | -11/+15 |
| | | | | Also add missing entries and use the formating convention | ||||
* | update changelogs for gems without changes too [ci skip] | Vijay Dev | 2012-03-09 | 1 | -0/+8 |
| | |||||
* | CHANGELOG revision for v3.2.1 | Xavier Noria | 2012-01-26 | 1 | -0/+8 |
| | |||||
* | Preparing for 3.2.0 release | David Heinemeier Hansson | 2012-01-20 | 1 | -1/+1 |
| | |||||
* | Add release notes URL to vendor/plugins deprecation warning. Update CHANGELOG. | Jeremy Kemper | 2012-01-04 | 1 | -1/+1 |
| | |||||
* | Deprecate Rails::Plugin in favor of gems | Santiago Pastorino | 2012-01-03 | 1 | -0/+2 |
| | |||||
* | Mip Earson -> Michael Pearson in changelog. | Michael Pearson | 2011-12-25 | 1 | -1/+1 |
| | |||||
* | registers guide generation for the Kindle and Kindle apps in the Changelog | Xavier Noria | 2011-12-25 | 1 | -0/+2 |
| | |||||
* | Update CHANGELOGs. | José Valim | 2011-12-24 | 1 | -0/+2 |
| | |||||
* | Update CHANGELOGs and guides. | José Valim | 2011-12-16 | 1 | -0/+2 |
| | |||||
* | Speed up development by only reloading classes if dependencies files changed. | José Valim | 2011-12-12 | 1 | -4/+3 |
| | | | | | | | | This can be turned off by setting `config.reload_classes_only_on_change` to false. Extensions like Active Record should add their respective files like db/schema.rb and db/structure.sql to `config.watchable_files` if they want their changes to affect classes reloading. Thanks to https://github.com/paneq/active_reload and Pastorino for the inspiration. <3 | ||||
* | fix typo in railties changelog | Vijay Dev | 2011-12-03 | 1 | -1/+1 |
| | |||||
* | revises some details in the previous explain patch | Xavier Noria | 2011-12-02 | 1 | -1/+1 |
| | |||||
* | implements automatic EXPLAIN logging for slow queries | Xavier Noria | 2011-12-02 | 1 | -1/+6 |
| | |||||
* | Split and improve show and debug exceptions middlewares. | José Valim | 2011-12-01 | 1 | -2/+4 |
| | |||||
* | Revert the serializers API as other alternatives are now also under discussion | José Valim | 2011-11-25 | 1 | -2/+0 |
| | |||||
* | Display mounted engines in `rake routes` by default | Piotr Sarnacki | 2011-11-25 | 1 | -1/+1 |
| | |||||
* | Merge branch 'serializers' | José Valim | 2011-11-25 | 1 | -7/+9 |
|\ | | | | | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md |