Xavier Noria
d491130236
Merge branch 'master' of git://github.com/lifo/docrails
...
Conflicts:
actionpack/lib/action_view/helpers/date_helper.rb
railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
2011-05-14 11:21:27 +02:00
Xavier Noria
e5524d538c
minor edits after going through what's new in docrails
2011-05-14 11:15:43 +02:00
Nick Sutterer
e3b3f416b5
added docs for AbC::UrlFor and AC::UrlFor.
2011-05-12 09:31:36 +02:00
Sebastian Martinez
9899f53184
better styling on #available_action? docs
2011-05-06 14:23:25 -03:00
José Valim
9c2c25c1a1
Revert to old semantics, use available_action? instead of action_method?.
2011-05-06 18:44:18 +02:00
José Valim
d42bb68430
More updates to ivars list.
2011-05-06 14:57:25 +02:00
José Valim
894bdbd53d
Move variables to underscore format, update protected instance variables list.
2011-05-06 14:57:25 +02:00
José Valim
1632a3a49f
More AV::Base cleanup.
2011-05-04 12:07:37 +02:00
José Valim
6afc900191
Move prefixes to view paths as they are now a lookup context dependency.
2011-05-04 11:28:37 +02:00
José Valim
c9fa3f03fe
Also allow prefixes as third argument to lookup context.
2011-05-04 09:07:11 +02:00
Nick Sutterer
eb327c1bab
no @controller dependency in Renderers.
2011-05-04 00:12:11 +02:00
Nick Sutterer
65ceccb0ba
controller's prefixes are now added to LookupContext.
2011-05-03 23:41:38 +02:00
José Valim
f9849070ac
Add a shared entry point for AV and AC render which can be used as extension in the future.
2011-05-03 16:51:47 +02:00
José Valim
b735761385
Introduce view renderer.
2011-05-01 13:40:13 +02:00
Piotr Sarnacki
d4bea35f1a
Make ActionController::Base.modules_for_helpers and ActionController::Base.all_helpers_from_path public methods
2011-04-25 15:02:41 +02:00
José Valim
a66c917235
Do not inherit from Rack::Response, remove a shit-ton of unused code.
2011-04-19 11:54:12 +02:00
José Valim
4f044528c0
Slightly reorganize rendering stack.
2011-04-18 08:12:51 +02:00
José Valim
d6bd606bdd
render :once, YAGNI.
2011-04-15 21:11:54 +02:00
Eric Hayes
ada550d908
Fixed a comment typo
2011-04-14 16:29:06 +08:00
Prem Sichanugrist
0f8a6ebba3
Fix missing requires in Action Mailer
...
This made the isolated test failed on CI server.
Signed-off-by: Xavier Noria <fxn@hashref.com >
2011-04-13 19:52:19 +02:00
Joshua Peek
ed24595647
Merge branch 'master' into sprockets
2011-04-12 21:56:00 -05:00
Oge Nnadi
d5634b2287
Added missing </tt>
2011-04-11 13:08:58 -07:00
Santiago Pastorino
cc58fe79ac
Implicit actions named not_implemented can be rendered
2011-04-02 23:47:50 -03:00
Joshua Peek
56a5da89db
Merge branch 'master' into sprockets
...
Conflicts:
railties/lib/rails/application/configuration.rb
2011-03-30 21:04:33 -05:00
Joshua Peek
5df076ad09
Merge branch 'master' into sprockets
2011-03-30 20:56:05 -05:00
José Valim
ba51aa0b1b
Make action_method? public and change implicit rendering to override it instead.
2011-03-30 17:22:05 +02:00
Joshua Peek
bed7a1acc4
Copy use_sprockets config
2011-03-29 16:17:49 -05:00
José Valim
94907035b6
Pass the proper method_name instead of hardcoding to action_name.
...
Conflicts:
actionpack/lib/action_controller/metal/implicit_render.rb
2011-03-29 19:30:59 +02:00
Andrew White
9772de8d45
Fix filter :only and :except with implicit actions
...
The method_name argument is "default_render" for implicit actions
so use the action_name attribute to determine which callbacks to run.
[#5673 state:resolved]
2011-03-23 23:32:44 +00:00
Manuel Meurer
deae670e9a
Change ActionView::ViewPathSet to ActionView::PathSet
2011-03-13 15:14:51 +07:00
Neeraj Singh
806e6f80dc
render_to_string must ensure that response_body
...
is nil
[ #5875 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com >
2011-01-25 20:14:03 +01:00
José Valim
262b2ea8cd
Solve SystemStackError when changing locale inside ActionMailer [ #5329 state:resolved]
2011-01-19 23:42:10 +01:00
Nick Sutterer
db24701abe
process_action accepts multiple args, even with Callbacks.
2010-12-29 16:37:10 -08:00
wycats
e03e1fdbc8
Speed up template inheritance and remove template inheritance option
2010-12-26 23:56:09 -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
Neeraj Singh
3c7a33c051
Rewording existing comment
2010-11-30 10:00:47 -05:00
Neeraj Singh
aa9a3227a0
Rewording existing comment
2010-11-29 21:38:59 -05:00
Santiago Pastorino
d3f8765482
Avoid range object creation
2010-11-20 02:29:57 -02:00
Santiago Pastorino
bb7b705b0c
Fix indentation
2010-11-19 14:26:44 -02:00
Santiago Pastorino
555b7cd04a
Don't merge just directly add to the action to the :partial key
2010-11-19 14:26:42 -02:00
Santiago Pastorino
b1ffd65b8f
Useless assignation
2010-11-19 14:26:39 -02:00
José Valim
a897402863
Remove inline comment.
2010-11-11 17:07:06 +01:00
Marcelo Giorgi
2bb1c202b4
Make after_filter halt when before_filter renders or redirects [ #5648 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com >
2010-11-11 17:05:07 +01:00
Andrew White
4ba24ba043
Allow generated url helpers to be overriden [ #5243 state:resolved]
2010-10-26 14:27:18 +01:00
José Valim
940b57789f
Add support to render :once.
...
This will be used internally by sprockets to ensure requires are executed just once.
2010-10-10 12:43:26 +02:00
wycats
8cb2cfbf71
Fix a few bugs when trying to use Head standalone
2010-10-10 00:54:11 -07:00
José Valim
c563f10f3e
render :template => 'foo/bar.json' now works as it should.
2010-10-07 21:31:31 +02:00
José Valim
8f9e9118e4
Make collection rendering faster.
2010-10-07 21:31:31 +02:00
Aaron Patterson
1d9a219307
oops, missed a uniq
2010-09-29 11:53:34 -07:00
