aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* updating the changelogAaron Patterson2013-12-021-1/+1
|
* updating changelogsAaron Patterson2013-10-161-0/+4
|
* bumping to 3.2.15Aaron Patterson2013-10-151-1/+1
|
* bumping to rc3Aaron Patterson2013-10-111-1/+1
|
* bumping to rc2Aaron Patterson2013-10-041-1/+1
|
* bumping version to 3.2.15.rc1Aaron Patterson2013-10-031-2/+2
|
* make sure both headers are set before checking for ip spoofingTamir Duberstein2013-10-011-0/+10
|
* Merge pull request #12048 from tjouan/app_generator-bin_perms-umaskAaron Patterson2013-08-271-1/+1
| | | | | | Comply with current umask when generating new app Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb
* Fix test incompatible with 1.8.7Eugene Kalenkovich2013-08-181-4/+4
|
* Make `rake doc:guides` works again. Fix #10384.Teng Siong Ong2013-08-052-3/+3
| | | | | | Conflicts: railties/guides/rails_guides.rb railties/lib/rails/tasks/documentation.rake
* Merge branch '3-2-14' into 3-2-stableRafael Mendonça França2013-07-222-2/+2
|\
| * Preparing for 3.2.14 releaseRafael Mendonça França2013-07-221-1/+1
| |
| * Update CHANGELOG entryRafael Mendonça França2013-07-221-6/+1
| |
| * Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-162-2/+7
| |
| * Preparing for 3.2.14.rc1 releaseRafael Mendonça França2013-07-122-3/+3
| |
* | Add test to prevent route reloading regressionAndrew White2013-07-211-0/+45
|/ | | | | | | Journey doesn't clear its named route hash when the routes are reloaded but Rails 3.2 isn't affected because Journey overwrites the existing route. This is just a backport of the test to make sure it doesn't become affected in some future release.
* Add license to the gemspecRafael Mendonça França2013-07-081-0/+3
|
* unify duplicate CHANGELOG entryYves Senn2013-06-271-6/+2
|
* clear ARGV to prevent mintest autorun errors:Yves Senn2013-06-273-0/+8
| | | | | | | | | | | | | | | | | | | | | | Minitest expects the first argument in `ARGV` to be the path to a test file. Because `rails benchmarker` and `rails profiler` define an on-the-fly test-case, using the first `ARGV` to pass the code to execute this results in: ``` /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:167:in `block in non_options': file not found: 1000.times{"a string"} (ArgumentError) from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `map!' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:146:in `non_options' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:207:in `non_options' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:52:in `process_args' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:891:in `_run' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/minitest/unit.rb:884:in `run' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:21:in `run' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:326:in `block (2 levels) in autorun' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:27:in `run_once' from /Users/senny/.rbenv/versions/1.9.3-p374/lib/ruby/1.9.1/test/unit.rb:325:in `block in autorun' ``` clearing ARGV after defining the test-case solves this issue.
* Backport rails/rails-perftest#2 to fix rake test:benchmarkYves Senn2013-06-273-4/+11
|
* Fix textile markupRafael Mendonça França2013-06-241-1/+1
| | | | | Closes #11076 [ci skip]
* Update the feedback instructions [ci skip]Robin Dupret2013-06-201-5/+5
| | | | | | Since docrails as moved from lifo/docrails to rails/docrails we have to ask for commit rights or submit patches directly to the rails repository
* indicate the default Rails cache storeMatthieu Paret2013-06-191-2/+2
| | | | | memory_store is the default cache store implementation if you call ActiveSupport::Cache.lookup_store without arguments.
* 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:48:04 +0000