Commit Graph

3375 Commits

Author SHA1 Message Date
David Chelimsky
a26d407f63 ActionView::PathSet# accepts String or Array
- Closes #6692

Signed-off-by: José Valim <jose.valim@gmail.com>
2011-04-13 21:45:51 +02:00
Prem Sichanugrist
733bfa63f5 Remove #among? from Active Support
After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now.

It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`.
2011-04-13 20:25:28 +08:00
Xavier Noria
86d6cdd7f7 fixes the name of a test 2011-04-13 13:24:33 +02:00
Xavier Noria
7c9d91f53e removes render :update from views 2011-04-13 13:24:32 +02:00
Xavier Noria
90de26703e removes ActionView::Helpers::PrototypeHelper 2011-04-13 13:24:32 +02:00
Xavier Noria
06bdaae071 removes ActionView::Helpers::ScriptaculousHelper 2011-04-13 13:24:31 +02:00
Xavier Noria
5850f16935 removes the RJS template handler 2011-04-13 13:23:18 +02:00
Xavier Noria
eea66892c8 removes support for render :update 2011-04-13 13:23:17 +02:00
Xavier Noria
3223e04a21 removes support for RJS in button_to_function 2011-04-13 13:23:16 +02:00
Xavier Noria
b878757c50 removes assert_select_rjs 2011-04-13 13:23:16 +02:00
Xavier Noria
8449da929e removes support for RJS in link_to_function 2011-04-13 13:23:16 +02:00
Matt Duncan
93def19063 Fixing distance_of_time_in_words range near 2 days 2011-04-13 16:14:52 +08:00
Joshua Peek
ed24595647 Merge branch 'master' into sprockets 2011-04-12 21:56:00 -05:00
David Heinemeier Hansson
d1575ae1b9 Change Object#either? to Object#among? -- thanks to @jamesarosen for the suggestion! 2011-04-12 00:23:07 +02:00
Prem Sichanugrist
d6edaeeaf8 Fix failing test case on master
It turned out that I overlook at some replacements ..
2011-04-10 22:40:21 -07:00
Prem Sichanugrist
a9f3c9da01 Using Object#in? and Object#either? in various places
There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
2011-04-11 03:17:09 +08:00
James Robinson
2cdc1f0cd5 Make csrf_meta_tags use the tag helper
Improved formatting of csrf_helper and improved test coverage
2011-04-08 02:21:08 +02:00
Aaron Patterson
a7c5d40d80 Merge branch 'master' of github.com:rails/rails
* 'master' of github.com:rails/rails:
  Cache flash now
  Revert "Use freeze instead of close!"
  Revert "Eagerly load Signed and Permanent cookies"
  cookies here
  Eagerly load Signed and Permanent cookies
  Use freeze instead of close!
2011-04-07 09:35:24 -07:00
Santiago Pastorino
03d561ad77 Revert "Use freeze instead of close!"
This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af.
2011-04-07 09:26:04 -03:00
Santiago Pastorino
17205435f8 cookies here 2011-04-07 09:20:35 -03:00
Aaron Patterson
1e90229e04 many args does not make sense with the current implementation because of how use works 2011-04-06 18:13:16 -07:00
Aaron Patterson
32f876786a getting the flash hash under test 2011-04-06 18:01:03 -07:00
Aaron Patterson
76c2ea7882 favor composition over inheritance, have FlashHash delegate to a Hash 2011-04-06 17:26:55 -07:00
Santiago Pastorino
29592a7f09 Use freeze instead of close! 2011-04-06 20:53:48 -03:00
Santiago Pastorino
9f765f4e09 Delete useless arguments 2011-04-06 19:18:41 -03:00
Santiago Pastorino
ed04243629 Delete useless env variable 2011-04-06 19:15:33 -03:00
Santiago Pastorino
0d45567362 Add tests to verify that signed and permanent cookies raises if someone tries
to modify the cookies when it was already streamed back to the client
or converted to HTTP headers
2011-04-06 19:12:35 -03:00
Santiago Pastorino
0e4748cd41 Make process reuse the env var passed as argument 2011-04-06 16:37:55 -03:00
Santiago Pastorino
0c5aded092 raise if someone tries to modify the cookies when it was already streamed back to the client or converted to HTTP headers 2011-04-06 15:47:58 -03:00
Aaron Patterson
2e757bc298 do not return html safe strings from auto_link 2011-04-05 16:22:53 -07:00
Santiago Pastorino
d7a5638dfb raise if someone tries to modify the flash when it was already streamed back to the client or converted to HTTP headers 2011-04-05 10:41:34 -03:00
Santiago Pastorino
cc58fe79ac Implicit actions named not_implemented can be rendered 2011-04-02 23:47:50 -03:00
Josh Kalderimis
b45302d767 pass respond_with options to controller render when using a template for api navigation
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-03-31 18:53:36 +02:00
Josh Kalderimis
48404a751d only try to display an api template in responders if the request is a get or there are no errors
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-03-31 18:53:27 +02:00
Josh Kalderimis
9766997f4c when using respond_with with an invalid resource and custom options, the default response status and error messages should be returned
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-03-31 18:53:21 +02: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
77d8f7a4b7 Seperate asset directories 2011-03-29 21:40:24 -05:00
Joshua Peek
1af295fc9a Tests for SprocketsHelper 2011-03-29 15:42:31 -05:00
Sebastian Martinez
52351bcfeb Remove 'warning: ambiguous first argument' when running ActionPack tests
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-03-29 10:23:10 -03:00
Prem Sichanugrist
84a4ef63a4 Move mapper_test to the appropriate location
It seems like in 89c5b9aee7d7db95cec9e5a934c3761872ab107e Aaron actually put the test in action_dispatch folder. However, there's already a `test/dispatch` directory which I think it's more appropriate.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
2011-03-29 10:12:17 +01:00
Prem Sichanugrist
51551a0a5b Update the wildcard route to be non-greedy by default, therefore be able to match the (.:format) segment [#6605 state:resolved]
After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route.

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
2011-03-29 10:12:17 +01:00
David Heinemeier Hansson
e2b07ee000 Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH] 2011-03-28 18:10:08 -07:00
Prem Sichanugrist
7cbdfa8303 Add controller-specific force_ssl method to force web browser to use HTTPS protocol
This would become useful for site which sometime transferring sensitive information such as account information on particular controller or action.

This featured was requested by DHH.
2011-03-28 04:58:47 +08:00
David Heinemeier Hansson
cc6fa2f4d7 Fix alias_method, add test 2011-03-27 11:20:54 -07:00
David Heinemeier Hansson
f8a05ad297 Allow FormHelper#form_for to specify the :method as a direct option instead of through the :html hash [DHH] 2011-03-26 14:45:00 -07:00
Josh Kalderimis
5170d210e8 correction to the outputted controller name in the diagnostics error template, test included
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-03-24 19:43:48 -03: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
Manfred Stienstra
5da9a74bd3 Add a failing test case for an implicit action with a before filter.
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
2011-03-23 23:32:44 +00:00