Commit Graph

8028 Commits

Author SHA1 Message Date
Greg Ose
f6844fc683 move serialization option from cookie option to global env option 2014-09-23 16:14:57 +10:00
Charlie Somerville
7a882329ed more 2014-09-15 15:00:13 +10:00
Charlie Somerville
730e5c4fa3 this test also 2014-09-15 14:49:45 +10:00
Charlie Somerville
e61bcf3d9d kill this test 2014-09-15 14:47:21 +10:00
Charlie Somerville
7ce60331c3 more more more 2014-09-15 14:44:52 +10:00
Charlie Somerville
7d31e49b1e rip out more sprockets stuffs 2014-09-15 14:38:42 +10:00
Charlie Somerville
7f3ec3496d remove sprockets dependency 2014-09-15 14:36:51 +10:00
Charlie Somerville
88827a2cab rip out a bunch of sprockets stuff 2014-09-15 14:35:28 +10:00
Charlie Somerville
7684d715ef Merge remote-tracking branch 'upstream/3-2-stable' into 3-2-github 2014-09-15 14:04:33 +10:00
Rafael Mendonça França
53c845cb18 Preparing for 3.2.19 release 2014-07-02 12:55:09 -03:00
Rafael Mendonça França
297bff7f8f Make sure Active Support configurations are applied correctly
Before this patch configuration set using config.active_support
would not be set.

Closes #15364
2014-06-26 18:40:23 -03:00
Rafael Mendonça França
4e8f1d2588 Preparing for 3.2.18 release 2014-05-06 11:33:10 -03:00
Charlie Somerville
32f98697a7 go away generator tests 2014-04-10 21:22:06 +10:00
Charlie Somerville
a09c04585e rm this test because it fails and we don't particularly care about plugins 2014-04-10 20:35:10 +10:00
Rafael Mendonça França
666e9f65bd Preparing for 3.2.17 release 2014-02-18 15:16:57 -03:00
Aaron Patterson
64226302d8 updating the changelog 2013-12-02 16:17:19 -08:00
Aaron Patterson
538f8ba0c1 updating changelogs 2013-10-16 10:01:01 -07:00
Aaron Patterson
2a0c4403fd bumping to 3.2.15 2013-10-15 11:48:53 -07:00
Aaron Patterson
e3abd78ee5 bumping to rc3 2013-10-11 14:16:06 -07:00
Aaron Patterson
5ede19b772 bumping to rc2 2013-10-04 13:46:35 -07:00
Aaron Patterson
5e277c8208 bumping version to 3.2.15.rc1 2013-10-03 11:52:44 -07:00
Tamir Duberstein
85106decc4 make sure both headers are set before checking for ip spoofing 2013-10-01 01:26:07 -07:00
Aaron Patterson
59a3561045 Merge pull request #12048 from tjouan/app_generator-bin_perms-umask
Comply with current umask when generating new app
Conflicts:
	railties/lib/rails/generators/rails/app/app_generator.rb
2013-08-27 14:06:13 -07:00
Eugene Kalenkovich
93f1a7219b Fix test incompatible with 1.8.7 2013-08-18 11:20:31 -07:00
Teng Siong Ong
946ad5d9f9 Make rake doc:guides works again. Fix #10384.
Conflicts:
	railties/guides/rails_guides.rb
	railties/lib/rails/tasks/documentation.rake
2013-08-05 16:02:17 -04:00
Rafael Mendonça França
2b3ce8627b Merge branch '3-2-14' into 3-2-stable 2013-07-22 20:24:09 -03:00
Rafael Mendonça França
2fcd13eff2 Preparing for 3.2.14 release 2013-07-22 12:05:41 -03:00
Rafael Mendonça França
47fb44fc7a Update CHANGELOG entry 2013-07-22 11:57:02 -03:00
Andrew White
d8353073d1 Add test to prevent route reloading regression
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.
2013-07-21 17:48:24 +01:00
Rafael Mendonça França
a96df04aac Preparing for 3.2.14.rc2 release 2013-07-16 13:00:33 -03:00
Rafael Mendonça França
facfc24f25 Preparing for 3.2.14.rc1 release 2013-07-12 21:06:50 -03:00
Rafael Mendonça França
2ce875dfbd Add license to the gemspec 2013-07-08 14:51:19 -03:00
Yves Senn
9a8f59340b unify duplicate CHANGELOG entry 2013-06-27 22:00:27 +02:00
Yves Senn
b47f8d035e clear ARGV to prevent mintest autorun errors:
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.
2013-06-27 21:11:03 +02:00
Yves Senn
1db54d7d01 Backport rails/rails-perftest#2 to fix rake test:benchmark 2013-06-27 20:44:08 +02:00
Rafael Mendonça França
119f27c519 Fix textile markup
Closes #11076

[ci skip]
2013-06-24 16:09:10 -03:00
Robin Dupret
f3b84e2d96 Update the feedback instructions [ci skip]
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
2013-06-20 21:35:44 +02:00
Matthieu Paret
31899da159 indicate the default Rails cache store
memory_store is the default cache store implementation if you call
ActiveSupport::Cache.lookup_store without arguments.
2013-06-19 11:06:16 +02:00
Rafael Mendonça França
b1fb8efd9b Improve CHANGELOG entries
[ci skip]
2013-05-12 18:45:57 -03:00
Rafael Mendonça França
442b7c8ccf Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0
backport runner fixes to 3-2-stable

Conflicts:
	railties/CHANGELOG.md
2013-05-12 15:13:47 -03:00
Arun Agrawal
8407ab10f0 Build fix for scaffold generator
3-2 behaves different when scaffolding.
2013-05-07 12:53:23 +02:00
Carlos Antonio da Silva
3c01a693d9 Merge pull request #10466 from prathamesh-sonpatki/scaffold-assets
Fix tests related to scaffolding generator with --assets=false switch
2013-05-05 11:31:15 -03:00
Rafael Mendonça França
927a04da40 Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master
Fixes Scaffold generator with --assets=false
Conflicts:
	railties/CHANGELOG.md

Conflicts:
	railties/CHANGELOG.md
	railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
2013-05-04 10:58:53 -03:00
Aaron Patterson
03d071d3cf adding a test for root path in the app 2013-04-17 11:30:17 -07:00
Carlos Antonio da Silva
dddc093a1a Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygems
Using secure source https://rubygems.org when generating new plugin with Rails 3.2
2013-04-17 05:23:03 -07:00
Prathamesh Sonpatki
cd548d9283 Use secure source in generated Gemfile for creating new plugin. Closes #10245 2013-04-17 17:40:52 +05:30
Carlos Antonio da Silva
624428b278 Fix "Scaling Rails Screencasts" link in caching guide
Closes #10241 [ci skip]
2013-04-16 20:25:34 -03:00
Steve Klabnik
bac6928eef Add attr_accessible to the Getting Started Guide.
This was brought up in #9995, but is only present in 3-2-stable, since
mass assignment is removed from Rails 4.
2013-03-29 16:28:04 -07:00
Carlos Antonio da Silva
517060ab59 Be consistent with quotes in smtp example guide [ci skip] 2013-03-19 17:57:22 -03:00
Evan Phoenix
8aadc6f0f4 Change @env_config to @app_env_config
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.
2013-03-18 19:33:47 -07:00