github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,222 Commits 34 Branches 105 Tags
bf22b287a4720cd4e5fc4206262a09ebf490609a
Commit Graph

6482 Commits

Author SHA1 Message Date
José Valim
ecc83c1e6e Clean up PathSet. 2010-12-27 10:15:54 +01:00
José Valim
6b099975fa No need to symbolize these. 2010-12-27 09:30:36 +01:00
José Valim
51a7d9acdd Final tidy up on templates inheritance. 2010-12-27 09:14:13 +01:00
wycats
e03e1fdbc8 Speed up template inheritance and remove template inheritance option 2010-12-26 23:56:09 -08:00
wycats
7c568fda6b A bunch of cleanup on the inherited template patch 2010-12-26 23:44:51 -08:00
artemave
6c5a3bb312 all tests pass 2010-12-26 22:32:15 -08:00
artemave
ce21ea7832 #948 make template inheritance optional 2010-12-26 22:32:15 -08:00
artemave
ddd85ef9c6 #948 template_inheritance 2010-12-26 22:32:15 -08:00
Santiago Pastorino
2cbf948f25 Bump up rack-cache 2010-12-24 14:38:18 -02:00
Xavier Noria
8cdb758081 Merge branch 'master' of github.com:rails/rails 2010-12-24 01:55:35 +01:00
José Valim
d6efd3cfc2 Don't deprecate to_prepare. 2010-12-23 19:21:14 +01:00
José Valim
819b8cae40 Clean up callbacks should also be called on exceptions. 2010-12-23 19:17:02 +01:00
Rizwan Reza
9dfa06acb4 Edits to caching/fragments. 2010-12-23 16:29:40 +03:30
Rizwan Reza
0997d5a12d More minor edits. 2010-12-23 16:13:36 +03:30
Rizwan Reza
5fb2f0c07f Revised documentation for cache_helper. 2010-12-23 16:06:53 +03:30
Santiago Pastorino
5853583f9b Allow registering javascript/stylesheet_expansions to existing symbols 2010-12-22 21:53:24 -02:00
Xavier Noria
8a3132b8a9 Merge branch 'master' of git://github.com/lifo/docrails 2010-12-23 00:15:10 +01:00
Piotr Sarnacki
09195f10bd Do not use the same hash instance for expansions [#6114 state:resolved] 
Using the same hash instance makes using the same expansions for
both javascripts and stylesheets.
 2010-12-22 09:44:46 +01:00
John Firebaugh
0b0e6f13c0 Typo (request -> response) 2010-12-21 19:32:34 -08:00
John Firebaugh
d4afde9ab0 Expand ActionDispatch::Reloader docs 2010-12-21 19:26:33 -08:00
Xavier Noria
880f8419c4 Merge branch 'master' of git://github.com/lifo/docrails 2010-12-20 20:13:34 +01:00
José Valim
0cbfd6c28d Small changes on AD::Reloader. 2010-12-20 12:43:02 +01:00
John Firebaugh
435bccda93 Replace AD::Callbacks.to_prepare with AD::Reloader.to_prepare 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-12-20 12:43:02 +01:00
John Firebaugh
0f7c970e4f Introduce ActionDispatch::Reloader 
Based on the implementation on the 2-3-stable branch, patches by Hongli
Lai <hongli@phusion.nl>, and helpful suggestions from José Valim.

Hongli Lai's patches included locking around the request cycle; this is
now handled by Rack::Lock (https://github.com/rack/rack/issues/issue/87/).

[#2873]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-12-20 12:43:02 +01:00
Santiago Pastorino
ab2bde45f8 Remove require AS::Concern from places where is already in 2010-12-19 19:15:26 -02:00
Vijay Dev
4038a6bc0f minor fixesin READMEs 2010-12-20 01:07:33 +05:30
Santiago Pastorino
f249d07c44 Add missing require 2010-12-19 14:00:08 -02:00
Will
aebbbc78cc Fix respond_with example code so it makes sense 2010-12-19 14:16:54 +11:00
Will
1a6c4c86ea Correct deprecated AR usage in ActionController::MimeResponds documentation 2010-12-19 14:14:02 +11:00
Don Wilson
f71809f257 Fixed number_with_precision rounding error [#6182 state:resolved] 2010-12-18 10:00:37 +01:00
Aaron Patterson
5008d33eee dry up case / when statement 2010-12-17 11:31:15 -08:00
Piotr Sarnacki
07567aea5f Revert "Fixed number_with_precision rounding error [#6182 state:resolved]" 
This reverts commit 006ec77e60.
 2010-12-17 16:11:47 +01:00
Don Wilson
006ec77e60 Fixed number_with_precision rounding error [#6182 state:resolved] 2010-12-17 11:32:19 +01:00
Piotr Sarnacki
f176b2552e Changelog and guide entries for config.action_view.cache_template_loading 2010-12-16 22:53:19 +01:00
Piotr Sarnacki
e89fff2f6b Bring back config.action_view.cache_template_loading [#5847 state:resolved] 2010-12-16 22:24:48 +01:00
Pavel Gorbokon
96bae30538 Replace rudimentary named_scope with scope. [#6052 state:resolved] 
* rename method names (actually in tests)
* rename instance variable @_named_scopes_cache to @_scopes_cache
* rename references in doc comments
* don't touch CHANGELOG :)
 2010-12-15 14:02:30 -08:00
brainopia
ebc47465a5 Fix edge cases for domain :all option on cookie store 
Dont set explicit domain for cookies if host is not a domain name

[#6002 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-12-16 01:49:30 +05:30
Piotr Sarnacki
a462a76bd3 Set proper engine's asset directories when assets are served from engine. 
When using stylesheet_link_tag(:all) or javascript_include_tag(:all),
assets directories are searched for css or js files. When
config.serve_static_assets is set to true, those files can be
served directly from engine's directories. That's why assets paths
should be set individually for controllers inside engine
if we want to serve static assets with ActionDispatch::Static
 2010-12-16 01:49:29 +05:30
Xavier Noria
3c9486f487 Merge branch 'master' of git://github.com/lifo/docrails 2010-12-15 20:18:36 +01:00
brainopia
439c23dce3 Fix edge cases for domain :all option on cookie store 
Dont set explicit domain for cookies if host is not a domain name

[#6002 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
 2010-12-15 11:03:03 -02:00
Aditya Sanghi
6fc3750471 eternal confusion! fixed doco to inform correctly 2010-12-15 16:13:36 +05:30
Piotr Sarnacki
0e5ee9af48 Set proper engine's asset directories when assets are served from engine. 
When using stylesheet_link_tag(:all) or javascript_include_tag(:all),
assets directories are searched for css or js files. When
config.serve_static_assets is set to true, those files can be
served directly from engine's directories. That's why assets paths
should be set individually for controllers inside engine
if we want to serve static assets with ActionDispatch::Static
 2010-12-15 10:01:27 +01:00
Ben Mills
73dafba6ca Added :placeholder option to ActionView::Helpers::FormTagHelper text_field_tag 2010-12-13 16:25:17 +10:00
Ryan Bigg
a81f68e879 Fix indentation on the namespace method's documentation 2010-12-13 13:03:41 +10:00
Ryan Bigg
a6bc1f9be4 Remove nodoc from FormBuilder because the methods inside are public API methods 2010-12-13 07:14:16 +10:00
Ryan Bigg
751733ab96 Provide an example for ActionDispatch::Routing::Mapper#scope 2010-12-11 17:27:14 +10:00
Xavier Noria
c6612d2bb3 Merge branch 'master' of git://github.com/lifo/docrails 
Conflicts:
	activerecord/lib/active_record/transactions.rb
 2010-12-11 00:55:25 +01:00
Ryan Bigg
dbf955c03b Action Controller Overview: Remove dead link to the API docs for filters 2010-12-10 15:55:46 +10:00
Ryan Bigg
f0d4b7f2a6 root method options are the same as the match method 2010-12-10 09:34:40 +10:00
Neeraj Singh
0027b65421 Ensure that while caching a page rails takes into 
account the resolved mime type for the request

[#6110 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-12-09 16:14:57 +01:00