aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Improve CHANGELOG entriesRafael Mendonça França2013-05-121-1/+5
| | | | [ci skip]
* Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-128-0/+77
|\ | | | | | | | | | | | | backport runner fixes to 3-2-stable Conflicts: railties/CHANGELOG.md
| * backport runner fixes to 3-2-stablekennyj2012-12-168-0/+79
| | | | | | | | | | | | | | Add a runner hook to Rails::Application and Rails::Engine that requires ActiveRecord::Base to avoid circular constant loading when using observers. This commit backports cc7dd66, c0ba0f0 and 8d01c61.
* | Build fix for scaffold generator Arun Agrawal2013-05-071-1/+1
| | | | | | 3-2 behaves different when scaffolding.
* | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assetsCarlos Antonio da Silva2013-05-051-4/+4
| | | | | | | | Fix tests related to scaffolding generator with --assets=false switch
* | Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-masterRafael Mendonça França2013-05-043-1/+20
| | | | | | | | | | | | | | | | | | | | Fixes Scaffold generator with --assets=false Conflicts: railties/CHANGELOG.md Conflicts: railties/CHANGELOG.md railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
* | adding a test for root path in the appAaron Patterson2013-04-171-0/+24
| |
* | Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygemsCarlos Antonio da Silva2013-04-171-1/+1
|\ \ | | | | | | Using secure source https://rubygems.org when generating new plugin with Rails 3.2
| * | Use secure source in generated Gemfile for creating new plugin. Closes #10245Prathamesh Sonpatki2013-04-171-1/+1
| | |
* | | Fix "Scaling Rails Screencasts" link in caching guideCarlos Antonio da Silva2013-04-161-1/+1
|/ / | | | | | | Closes #10241 [ci skip]
* | Add attr_accessible to the Getting Started Guide.Steve Klabnik2013-03-291-0/+2
| | | | | | | | | | This was brought up in #9995, but is only present in 3-2-stable, since mass assignment is removed from Rails 4.
* | Be consistent with quotes in smtp example guide [ci skip]Carlos Antonio da Silva2013-03-191-1/+1
| |
* | Change @env_config to @app_env_configEvan Phoenix2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moral of the story: One must be careful about lazily initializing instance variables when subclassing. I would like to draw your attention to https://github.com/rails/rails/issues/4652 where the reader will see that there appears to be some kind of initialization issue in rails. The source of this issue is that: 1) Engine#env_config contains "@env_config ||= ..." 2) Application#env_config contains "@env_config ||= ..." 3) Threads are in the picture 4) Thread A calls Application#env_config, which super's to Engine#env_config 5) After Engine#env_config returns but before Application#env_config sets @env_config again, Thread B begins running 6) Thread B calls Application#env_config 7) Thread B finds @env_config to contain a value (the one set by Engine#env_config) and returns it 8) Thread B blows up because key set by Application#env_config are there. 9) People report bugs with puma, thin, rainbows, webrick, etc 10) Evan becomes tired of seeing these bugs 11) Evan pours himself a stiff drink, puts on Top Gear(tm), and begins debugging 12) Evan finds the source of the bug 13) Evan authors a PR 14) RIGHT NOW. The bug is fixed by simply using a different ivar name in the methods. Alternately, Engine#env_config could just return a new Hash each time, not memoizing into @env_config. I bid you adieu.
* | Add release dates to documentation [ci skip]claudiob2013-03-181-1/+1
| | | | | | | | Set "March 18, 2013" as the release date for 3.2.13
* | Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-182-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | bumping to 3.2.13Aaron Patterson2013-03-181-1/+1
| | |
| * | bumping to rc2Aaron Patterson2013-03-061-1/+1
| | |
| * | Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-271-2/+2
| | |
| * | Update CHANGELOGs for 3.2.13 release.Steve Klabnik2013-02-271-0/+5
| | |
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 20:09:15 +0000