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
10,316 Commits 34 Branches 105 Tags
b4ef958de6b16294094de28d00ba25fe2f48accc
Commit Graph

156 Commits

Author SHA1 Message Date
Christos Zisopoulos
18a97a6601 Handle missing javascript/stylesheets assets by raising an exception 
An exception will be raised if a local javascript/stylesheet file included
by the stylesheet_link_tag or javascript_include_tag can not be found.

When caching is enabled, we use atomic_write to ensure that the cache file
is not created with zero length.

Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#2738 state:committed]
 2009-06-26 16:47:15 +12:00
Joshua Peek
b598baf813 ignore absolute tmp directory 2009-06-25 14:52:58 -05:00
Yehuda Katz + Carl Lerche
a9ad763c86 Drive the final stake through @content_for_*'s heart! 2009-06-17 18:08:45 -07:00
Yehuda Katz + Carl Lerche
6927f1119b Finish making pending tests pass 2009-06-17 12:54:19 -07:00
Yehuda Katz + Carl Lerche
86fc43fd58 ActionPack components should no longer have undeclared dependencies. 
* Tests can be run in isolation
  * Dependencies added
  * A few tests modified to avoid depending on AS deps 
    not depended on my files they were testing
 2009-06-08 13:34:07 -07:00
Jeremy Kemper
94911c7af7 Ensure ERB source begins with the encoding comment 2009-06-01 12:34:08 -07:00
Jeremy Kemper
5ec2c7dc29 Ruby 1.9: ERB template encoding using a magic comment at the top of the file 2009-05-28 17:12:48 -05:00
Yehuda Katz
e22a3d893e Slightly modify things to get content type matching working without breaking other code 2009-05-23 00:39:32 -07:00
Yehuda Katz + Carl Lerche
68a207ccf6 Implemented layout conditions in new base 2009-05-21 18:14:20 -07:00
Yehuda Katz + Carl Lerche
cecafc52ee Refactor ActionView::Template 
ActionView::Template is now completely independent from template
  storage, which allows different back ends such as the database.
  ActionView::Template's only responsibility is to take in the
  template source (passed in from ActionView::Path), compile it,
  and render it.
 2009-04-27 11:49:11 -07:00
Carl Lerche & Yehuda Katz
906aebceed Bring abstract_controller up to date with rails/master 
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:

2259ecf368
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea02e
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb995
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
  * We will need to reimplement rails-dev-boost on top of the refactor;
    the changes here are very implementation specific and cannot be
    cleanly applied. The following commits are implicated:

      199e750d46
      3942cb406e
      f8ea9f85d4
      e3b166aab3
      ae9f258e03
      44423126c6

0cb020b4d6
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a83
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b16246
fix HTML fallback for explicit templates [#2052 state:resolved]
  * There were a number of patches related to this that simply compounded
    each other. Basically none of them apply cleanly, and the underlying
    issue needs to be revisited. After discussing the underlying problem
    with Koz, we will defer these fixes for further discussion.
 2009-04-13 15:18:45 -07:00
Cezary Baginski
44423126c6 Additional template render test for backup files [#2367 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-04-02 11:58:29 -05:00
Yehuda Katz
8ab37c7660 Started implementing render :action 2009-03-19 13:35:39 -07:00
Yehuda Katz
e0447023db Implemented basic template rendering in AC::Base2: 
* Created several macros for writing simpler specs
* Finished making Rack::Test work right
* Implemented render_to_string
* Status Codes
* render :text => nil
 2009-03-18 15:58:47 -07:00
Joshua Peek
ea8488caef Fixed simplified render with nested models [#2042 state:resolved] 2009-03-07 14:05:18 -06:00
Matt Jones
87e8b16246 fix HTML fallback for explicit templates [#2052 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-03-07 13:32:46 -06:00
Joshua Peek
92a30b0c88 missed template fixtures with ~ 2009-02-24 11:36:58 -06:00
Matt Jones
b35562f432 correctly handle layouts for AJAX requests and regular js files [#2052 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-24 10:38:07 -06:00
Sven Fuchs
8c5cc66a83 make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-20 14:19:45 -06:00
Joshua Peek
e4a7c0bb5b ~ backup files don't clobber original templates [#1818 state:resolved] 2009-02-07 12:06:35 -06:00
José Valim
50f51ff950 Render implicit html template when xhr request now supports localization [#1886 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-07 11:37:02 -06:00
José Valim
24f2e676f7 Added support to dashed locales in templates localization [#1888 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-06 23:23:50 -06:00
Eugene Pimenov
b1c1e3deb7 Ruby 1.9 compat: change encoding of action_view/renderable to utf-8, so erb templates can use utf-8 properly 
[#1881 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-02-06 11:03:41 -08:00
Adam McCrea
06182ea02e implicitly rendering a js response should not use the default layout [#1844 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-05 15:23:05 -06:00
José Valim
2ecc678ed6 Added localized rescue (404.da.html) [#1835 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2009-02-02 17:56:22 +01:00
Yehuda Katz
3030bc90c9 Merge commit 'rails/3-0-unstable' 
Conflicts:

	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_dispatch/http/mime_type.rb
	actionpack/lib/action_dispatch/http/request.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/paths.rb
	actionpack/test/controller/session/cookie_store_test.rb
	actionpack/test/dispatch/rack_test.rb
	actionpack/test/dispatch/request_test.rb
 2009-01-30 11:30:27 -08:00
Joshua Peek
093f758bd0 Restore implicit rendering for XHR requests that want a HTML template [#1590 state:resolved] 2009-01-27 14:09:11 -06:00
Joshua Peek
a98cd7ca9b Add localized templates 
# Default locale
  app/views/messages/index.html.erb

  # I18n.locale is set to :da (Danish)
  app/views/messages/index.da.html.erb
 2009-01-25 22:51:21 -06:00
Pratik Naik
617ad23574 Remove the irrelevant fixture added in fe6ffce51d 2009-01-24 18:22:17 +00:00
Pratik Naik
fe6ffce51d Make sure inner scope conditions get a preference over the outer ones 2009-01-24 17:54:10 +00:00
Yehuda Katz
eb9af20b7c Begin unifying the interface between ActionController and ActionView 2009-01-22 16:18:10 -06:00
Joshua Peek
a8ad6568f9 Allow empty files to be uploaded 2009-01-20 20:34:35 -06:00
Mislav Marohnić
01f06fc7f4 Don't let empty Tempfiles come through as uploaded files [#1785 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-01-20 12:38:25 -06:00
Joshua Peek
f7ee082bb3 Add failing test for file uploads with unrewindable input 2009-01-02 18:46:01 -06:00
Sam Stephenson
ab211bf592 Fix rendering html partials from an rjs template 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-12-04 16:35:13 -06:00
Joshua Peek
2fc6c7dd05 Validate template extensions [#1187 state:resolved] 2008-12-03 10:57:35 -06:00
Sam Pohlenz
5ea9f2cac6 Allow helpers directory to be overridden via ActionController::Base.helpers_dir (Sam Pohlenz) [#1424 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-11-23 13:42:53 +01:00
David Heinemeier Hansson
130fe74d17 Changed the default of ActionView#render to assume partials instead of files when not given an options hash [DHH] 2008-11-19 14:00:16 +01:00
Luke Melia
60d6f25517 Fix rendering html partial via inline render when with :js format [#1399 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-11-18 15:19:16 -06:00
Joshua Peek
ec38c84ce1 Dup local assigns for partial collections so nil values doesn't get overwritten [#1250 state:resolved] 2008-10-30 15:07:47 -05:00
Ryan Bates
4ad5aa9a39 Ensure @content_for_* is checked before yielding to block in render :layout [#8994 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-10-28 17:31:33 -05:00
Joshua Peek
ac50ee0edf Track rendered templates in stack so the current template can always be accessed. Added ActionView::Base#template to access the template object. 2008-10-28 11:06:08 -05:00
Claudio Poli
5f83e1844c Fixed missing template paths on exception [#1082 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-09-20 22:57:45 -05:00
Ryan Bates
38c7d73e73 pass yielded arguments to block for ActionView::Base#render with :layout [#847 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-08-17 19:29:24 -05:00
Joshua Peek
3b9324e62f Fix rendering partials at the top level [#795 state:resolved] 2008-08-13 19:15:35 -05:00
Cameron Yule
2faf35cea9 Added tests for partial collection counters [#766 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-08-09 10:48:56 -05:00
Tom Ward
c3d1fda555 Set the response content type to that of found template if not explicitly set elsewhere [#444 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-07-18 20:14:12 -05:00
Joshua Peek
8b306bf24c Improved test coverage for fragment cache helper 2008-07-15 20:54:17 -05:00
Joshua Peek
e0fef66149 Made ActionView::Base#first_render a little more private. And added _last_render to track the most recent render. Will fix #609 as a side effect. [#609 state:resolved] 2008-07-13 13:26:48 -05:00
Joshua Peek
b603de0882 Improve test coverage and create fixtures for RenderPartialWithRecordIdentificationTests 2008-07-12 12:17:10 -05:00