github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-03 10:45:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,888 Commits 34 Branches 105 Tags
bfbf03ecee063adc9999c0dec50f8177594fb28f
Commit Graph

820 Commits

Author SHA1 Message Date
Pratik Naik
e520fd5db7 Delegate action_name to controller inside views. 2008-05-06 12:02:24 +01:00
Marcos Arias
2c39836dc3 Refactored and fixed Resources.map_member_actions to make use of custom ActionController::Base.resources_path_names when the option :path_names is not directly specified. Added a specific test for this functionality and fixed assert_restful_routes_for test helper to make use of ActionController::Base.resources_path_names instead of just "new" or "edit". 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#111 state:resolved]
 2008-05-06 21:48:07 +12:00
rick
37599d16f2 regression test for bug introduced in [6a6b4392c1] [Ian White] [#22 state:resolved] 2008-05-05 23:42:52 -07:00
Cheah Chu Yeow
ee1d508a6b Allow ActionController::Base#default_url_options to have a default options argument of nil. 
This fixes a bug introduced in [6a6b4392c1] which was breaking routing in ActionController::UrlWriter.
 2008-05-05 23:41:33 -07:00
Cheah Chu Yeow
6a6b4392c1 Ensure that default_url_options, if defined, are used in named routes. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#22 state:resolved]
 2008-05-04 12:49:44 +12:00
David Heinemeier Hansson
12288a0341 Merge branch 'master' of git@github.com:rails/rails 2008-05-01 17:26:46 -05:00
David Heinemeier Hansson
926f4648f0 Made the location of the routes file configurable with config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved] 2008-05-01 17:26:31 -05:00
Tobias Lütke
f48e89931f Accept header mime parser can now deal with empty fields 2008-05-01 17:45:14 -04:00
Pratik Naik
74436d2203 Fixed render :template for templates in top level of view path. [#54 state:resolved] 2008-05-01 10:21:46 +01:00
Tobias Lütke
fef82759ff Implement increment/decrement on cache storage engines, using read/write by default and using atomic command on memcache 2008-04-29 15:12:47 -04:00
Jeremy Kemper
642bcd2d01 Ruby 1.9 compat: force assert_select text encoding to the encoding of the regexp it's matching against. 2008-04-28 10:52:23 -07:00
Eugene Pimenov
e6a3ce3392 Make sure member names aren't mistakenly set to nil when providing :path_names 
[#19 state:resolved]

Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-04-23 20:19:22 +12:00
Pratik Naik
a04f022877 Delegate ivars to controller instead of copying 
Reduce number of instance variables being copied from controller to
view. Instead, delegate them to controller instance.
 2008-04-21 11:53:14 +01:00
Pratik Naik
2b69840e5e Remove ActionController::Base#view_controller_internals 
Get rid of ActionController::Base#view_controller_internals flag and
use @@protected_view_variables for storing the list of controller
specific instance variables which should be inaccessible inside views.
 2008-04-21 03:45:38 +01:00
Paul Horsfall
14a40804a2 Add conditional options to caches_page method [#25 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-04-19 16:21:34 -05:00
Pratik Naik
ef4c65088f Move missing template logic to ActionView 2008-04-19 18:59:13 +01:00
Pratik Naik
534c6b2444 Introduce ActionView::InlineTemplate class 2008-04-19 16:21:18 +01:00
Pratik Naik
986aec5dbb Refactor Dispatcher callbacks to remove unnecessary Dependencies checks in production environment. 2008-04-18 13:05:43 +01:00
Joshua Peek
745359a494 Stub out Dispatcher#log_failsafe_exception method to please the test gods. 2008-04-15 18:04:12 -05:00
David Heinemeier Hansson
420c4b3d88 Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 [nicksieger] 2008-04-13 17:33:27 -05:00
Michael Koziarski
60be4b09f5 Merge branch 'master' into custom_paths_for_resource_names 2008-04-12 12:40:51 +12:00
Michael Koziarski
063c393bf0 Allow alternative values for the 'new' and 'edit' actions in resourceful routes. 
map.resource :schools, :as => 'escuelas', :path_names => { :new => 'nueva' }

Closes #11181.  [ivanvr]
 2008-04-12 12:40:40 +12:00
Jeremy Kemper
9a7ab8b05b stub the instance method, there is no class method 2008-04-11 16:46:46 -07:00
David Heinemeier Hansson
e89093aeb4 Fixed that formatted_polymorphic_route should be able to take the :format as part of a single hash or as the option hash (references #8741) 2008-04-11 12:34:44 -05:00
Rick Olson
4d594cffcf Automatically parse posted JSON content for Mime::JSON requests. [rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-08 05:05:54 +00:00
Josh Peek
917423d664 Provide a helper proxy to access helper methods from outside views. Closes #10839 [Josh Peek] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9234 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-06 18:42:34 +00:00
Pratik Naik
1e087fd3fd Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-02 12:48:59 +00:00
Jeremy Kemper
30fa377f33 Ruby 1.9 compat: encoding and multibyte test fixes 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9194 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-01 07:39:04 +00:00
Jeremy Kemper
ecdddc4de5 Ruby 1.9 compat: proc arity 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9190 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-01 06:11:56 +00:00
Jeremy Kemper
a2ad945627 style & whitespace 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9189 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-01 06:11:48 +00:00
Jeremy Kemper
b79f7d127a Ruby 1.9: no args is 0 arity, not -1 as in 1.8 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9187 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-01 06:11:31 +00:00
Jeremy Kemper
9cc478a254 Support render :partial => collection of heterogeneous elements. Closes #11491. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9177 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-01 00:50:09 +00:00
Jeremy Kemper
a61b63d420 Avoid remote_ip spoofing 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9124 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-28 21:38:01 +00:00
Jeremy Kemper
5c0656c9ee Fix layouts in symlinked paths. Closes #9136 [court3nay, caio] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-28 20:54:26 +00:00
David Heinemeier Hansson
db3a60eb92 Added support for regexp flags like ignoring case in the :requirements part of routes declarations (closes #11421) [NeilW] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9115 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-28 20:01:21 +00:00
David Heinemeier Hansson
388e5d3fac Fixed that ActionController::Base#read_multipart would fail if boundary was exactly 10240 bytes (closes #10886) [ariejan] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9113 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-28 19:55:31 +00:00
David Heinemeier Hansson
c57254d449 Fixed HTML::Tokenizer (used in sanitize helper) didnt handle unclosed CDATA tags (closes #10071) [esad, packagethief] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-28 19:45:32 +00:00
Rick Olson
0381398708 Fix regression from filter refactoring where re-adding a skipped filter resulted in it being called twice. [rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9080 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-23 01:48:17 +00:00
Jeremy Kemper
f2840f508d Fix an edge case with extra periods in Routing.normalize_paths. Closes #11337 [cavalle, veejar] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9069 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-21 22:44:04 +00:00
Jeremy Kemper
856a4dcf12 Refactor filters to use Active Support callbacks. Closes #11235. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9055 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-18 17:56:05 +00:00
David Heinemeier Hansson
db08329946 Fixed that polymorphic routes would modify the input array (closes #11363) [thomas.lee] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-17 23:45:42 +00:00
Rick Olson
1e0ac3a673 Fix more obscure nested parameter hash parsing bug. Closes #10797 [thomas.lee] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9020 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-13 03:22:25 +00:00
Rick Olson
3a17ea9031 Fix nested parameter hash parsing bug. #10797 [thomas.lee] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9010 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-11 07:46:39 +00:00
Pratik Naik
cff3ecc2ae Allow using named routes in ActionController::TestCase before any request has been made. Closes #11273 [alloy] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8992 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-08 12:56:41 +00:00
Pratik Naik
011e469410 Make MimeResponds::Responder#any work without explicit types. Closes #11140 [jaw6] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8987 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-07 11:17:05 +00:00
Pratik Naik
d7627361d3 Remove unused ActionController::Base.template_class. Closes #10787 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8985 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-05 12:12:17 +00:00
Pratik Naik
a96272a0c5 Moved template handlers related code from ActionView::Base to ActionView::Template 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8981 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-05 02:03:24 +00:00
Michael Koziarski
cc5a957d2b Allow file uploads in Integration Tests. Closes #11091 [RubyRedRick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8978 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-03 06:42:24 +00:00
Michael Koziarski
51b6619d4e Refactor partial rendering into a PartialTemplate class. [Pratik] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8976 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-03 04:01:35 +00:00
David Heinemeier Hansson
7dcd0d7d96 Added that requests with JavaScript as the priority mime type in the accept header and no format extension in the parameters will be treated as though their format was :js when it comes to determining which template to render. This makes it possible for JS requests to automatically render action.js.rjs files without an explicit respond_to block [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8956 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-02-29 18:09:23 +00:00