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
26,768 Commits 34 Branches 105 Tags
1945bafba2dba80ae0e5595127361fed8bb2d5de
Commit Graph

210 Commits

Author SHA1 Message Date
José Valim
f29b4a02fd Add a test case for layout nil. 2011-12-20 14:56:18 +01:00
Piotrek Okoński
5266eb9f61 Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365 2011-12-12 17:11:07 +01:00
José Valim
ab30570b69 Fix extend -> include. 2011-12-09 21:42:18 +01:00
José Valim
5ad5215211 Deprecate implicit layout lookup in favor of inheriting the _layout config. 2011-12-09 07:20:55 +01:00
José Valim
67cc07e0c4 Just use the proc if there is a chance of layout lookup. 2011-12-08 16:51:47 +01:00
José Valim
239262fee0 Optimize layout lookup to avoid double calls. 2011-12-08 16:39:06 +01:00
José Valim
efc28a7f70 Some small optimizations and improvements to benchmark code. 2011-12-08 16:39:06 +01:00
Prem Sichanugrist
18ceed201b Allow layout fallback when using layout method 
Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail.

For example, consider this snippet:

    class CarsController
      layout 'single_car', :only => :show
    end

Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.
 2011-12-06 21:16:29 -05:00
José Valim
fd86a1b6b0 Rely on a public contract between railties instead of accessing railtie methods directly. 2011-11-23 19:06:45 +00:00
Dalibor Nasevic
759906d512 Fixed stale doc in AbstractController::Layouts 2011-11-06 14:43:11 +01:00
Alexey Vakhov
d42d97d2e3 Fix comment in AbstractController callbacks 2011-10-06 10:39:37 +04:00
José Valim
5711a35ad8 Ensure default_asset_host_protocol is respected, closes #2980. 2011-10-05 02:08:02 +02:00
José Valim
6e8fe1bf02 TestCase should respect the view_assigns API instead of pulling variables on its own. 2011-10-02 11:29:13 +02:00
Xavier Noria
bf2b9d2de3 Merge branch 'master' of github.com:lifo/docrails 
Conflicts:
	RELEASING_RAILS.rdoc
	actionpack/lib/sprockets/railtie.rb
	actionpack/test/template/sprockets_helper_test.rb
	activerecord/test/cases/calculations_test.rb
	railties/guides/source/3_1_release_notes.textile
	railties/guides/source/active_resource_basics.textile
	railties/guides/source/command_line.textile
 2011-08-13 16:30:07 -07:00
geemus
53e1a9d411 update abstract_controller callbacks to document meta-programmed filters 2011-08-13 16:22:35 -07:00
Santiago Pastorino
5b5b22acb5 Remove unused use_sprockets config 2011-08-13 16:22:15 -07:00
Aaron Patterson
5f56db4454 adding missing require to fist railties tests 2011-08-09 14:54:56 -07:00
Aaron Patterson
f9f423fa18 deprecating process_view_paths 2011-08-09 12:10:25 -07:00
Aaron Patterson
3ad26c8e48 avoid object creation via useless duping and freezing 2011-08-09 11:41:06 -07:00
Aaron Patterson
88de343ef4 Array#+ automatically dups, no double duping 2011-08-09 10:54:05 -07:00
Santiago Pastorino
cb85d70d61 Remove unused use_sprockets config 2011-07-25 19:07:39 -03:00
Jon Leighton
fcbde454f6 Don't do remove_possible_method when delegate is used. Two reasons: 1) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937. 2011-07-18 00:22:26 +01:00
Matt Jankowski
db4f0ac025 use present tense on examples 2011-06-21 15:12:11 -04:00
Matt Jankowski
538d2a52ce remove extra space and clarify how an exception is made for controller wide layouts 2011-06-21 10:34:31 -04:00
Matt Jankowski
20a9bddfad reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made 2011-06-21 10:31:16 -04:00
Sebastian Martinez
fcdb5dc557 Remove extra white spaces on ActionPack docs. 2011-05-23 20:22:33 -03:00
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