José Valim
caacf85673
Merge pull request #2327 from cesario/patch-1
...
We don't need to require erb here.
2011-07-28 11:24:08 -07:00
José Valim
b295ea1362
Merge pull request #2330 from thedarkone/resources-router-fix
...
Inline resources router fix
2011-07-28 11:10:23 -07:00
thedarkone
a5f57a7ef2
Make use of the inherited initializer.
2011-07-28 20:02:21 +02:00
thedarkone
4d4d2179f6
There is no need to be destructive with the passed-in options.
...
This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
2011-07-28 20:00:48 +02:00
Franck Verrot
ad0772f268
We don't need to require erb here.
2011-07-28 18:45:43 +03:00
José Valim
d5eeacc95f
Move the cache to a nested hash which performs better than a hash with array as keys.
2011-07-28 10:01:55 +02:00
José Valim
dee8115539
Rename class method to_path to _to_path and make it explicit that it is an internal method.
2011-07-28 09:56:42 +02:00
José Valim
1b7db58a06
Merge pull request #2034 from Casecommons/to_path
...
Allow ActiveModel-compatible instances to define their own partial paths
2011-07-28 00:50:07 -07:00
Joshua Peek
8248052ee7
Make Rails.application.assets available in initializers
2011-07-27 15:29:36 -05:00
Christos Zisopoulos
8faeed1d71
Improve performance and memory usage for options_for_select with Ruby 1.8.7
2011-07-27 08:37:10 -07:00
Aaron Patterson
0b987042bf
simplify conditionals by assuming hash values will never be false
2011-07-26 17:49:47 -07:00
Aaron Patterson
7868cf8a65
use regular ruby rather than clever ruby
2011-07-26 17:45:34 -07:00
Aaron Patterson
ba43b9bf5f
fixing wildcard path matching when wildcard is inside parenthesis
2011-07-26 17:33:22 -07:00
Santiago Pastorino
b4efff4bac
Remove blank line
2011-07-26 19:20:45 -03:00
Santiago Pastorino
77e67f419c
Merge pull request #2273 from thoefer/refactor
...
refactored 'assert_redirected_to'
2011-07-26 15:18:39 -07:00
Aaron Patterson
ef89a70540
Merge pull request #2095 from dgeb/issue-2094
...
Fixes overriding of options[:html][:remote] in form_for() (Issue #2094 )
2011-07-26 13:50:20 -07:00
thoefer
3bfcf5ffc8
refactored 'assert_redirected_to': local call to validate_request! will be called in assert_response already. changed names of local variables in order to recognize the semantics a bit easier.
2011-07-26 11:42:53 +02:00
Santiago Pastorino
b4e577945b
use_sprockets is not used anymore
2011-07-26 01:00:00 -03:00
José Valim
647eeb1881
Merge pull request #2262 from sferik/format_true
...
Allow a route to have :format => true
2011-07-25 15:51:43 -07:00
Santiago Pastorino
cb85d70d61
Remove unused use_sprockets config
2011-07-25 19:07:39 -03:00
Grant Hutchins & Peter Jaros
bf812074fd
Let ActiveModel instances define partial paths.
...
Deprecate ActiveModel::Name#partial_path. Now you
should call #to_path directly on ActiveModel
instances.
2011-07-25 16:05:24 -04:00
Erik Michaels-Ober
b9c9142603
Allow a route to have :format => true
...
When format is true, it is mandatory (as opposed to :format => false).
This is currently not possible with resource routes, which automatically
make format optional by default.
2011-07-25 11:37:25 -07:00
Santiago Pastorino
8e0061128e
Merge pull request #2245 from davidtrogers/constraints_block_passed_to_following_routes_in_same_scope
...
Memoizing @blocks & disposing of constraints options properly
2011-07-25 10:32:31 -07:00
Dave Rogers
4dc42f5353
Ensure the constraints block is only applied to the correct route
...
addresses issue #1907 - any routes that follow a route with a constraints
block are inheriting the previous route's constraints.
2011-07-25 09:59:53 -07:00
José Valim
b033a24814
Merge pull request #2258 from thedarkone/no-file-stat
...
Use shorter class-level File methods instead of going through File.stat
2011-07-25 08:13:21 -07:00
thedarkone
624b118616
Use shorter class-level File methods instead of going through File.stat.
2011-07-25 17:02:28 +02:00
thedarkone
036f77574d
Make polymorphic_url calls go through application helpers again.
...
This brings back the ability to overwrite/extend url generating methods in application heleprs.
2011-07-25 13:43:02 +02:00
Xavier Noria
12034516e2
Merge pull request #2243 from dmathieu/comment
...
Help the next guy with explanations - See bb3b3e306
2011-07-24 14:02:36 -07:00
Andrew White
0599e16dd9
Use top level Rails constant
2011-07-24 21:48:56 +01:00
Xavier Noria
4bb0a8bcbd
Merge branch 'master' of git://github.com/lifo/docrails
2011-07-24 21:02:51 +02:00
Damien Mathieu
ee56f7b8df
help the next guy with explanations - See bb3b3e306
2011-07-24 20:52:08 +02:00
Oemuer Oezkir
ee5cfdf120
Missed a few instances of British English spelling in the last commit
...
oh and obviously I meant according to Webster, not Weber
2011-07-24 10:40:40 +00:00
Oemuer Oezkir
71d18ce48e
Changed a few instances of of words in the API docs written in British English to
...
American English(according to Weber)
2011-07-24 10:21:42 +00:00
Gaston Ramos
dc1b0fd957
- added ActionView::PartialRenderer#merge_path_into_partial(path, partial)
...
fix issues/1951
2011-07-24 00:54:58 -03:00
Aaron Patterson
9327b4de58
Merge pull request #2228 from Empact/helper_tags_in_mailers
...
Simple fix to the NoMethodError noted in #2177 .
2011-07-23 20:40:12 -07:00
Ben Woosley
1f89898175
Simple fix to the NoMethodError noted in #2177 .
...
Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.
2011-07-23 17:31:48 -07:00
Damien Mathieu
bb3b3e3062
rake assets:precompile should always perform caching - Closes #2199
2011-07-24 01:32:14 +02:00
gnagno
72df64b4e1
now the documentation reflects the actual returned value for a missing translation
2011-07-23 08:26:18 -07:00
Xavier Noria
d352e0dff2
checked all .rb files in the project tree for missing magic comments, one was missing
...
Came with this one-liner for this:
find . -name '*.rb' | \
xargs chardet | \
grep -v ascii | \
cut -d: -f1 -s | \
xargs -n1 ruby -0777 -ne 'puts $FILENAME if $_ !~ /#.*coding:\s*utf/i'
Welcome $_.
2011-07-23 14:50:29 +02:00
Xavier Noria
ace3723d2f
Merge branch 'master' of git://github.com/lifo/docrails
2011-07-23 12:15:41 +02:00
Xavier Noria
38310ab1a6
little details seen while doing a pass through what's new in docrails
2011-07-23 12:14:10 +02:00
Aaron Patterson
5b6121aa34
use rake tasks to set the default environment variables. fixes #2126
2011-07-21 15:30:28 -07:00
Ray Baxter
18792069ab
use the doc conventions for arguments in all cases
...
See 5c71a4e768 (commitcomment-485675)
2011-07-20 23:33:42 -07:00
ogeidix
1ac802fe3c
Check Accept and Content-Type headers before evaluating them in xhr requests. Closes #2119
...
An xhr request must have an "Accept" or "Content-type" header in order to be considered a request with valid_accept_header.
2011-07-19 22:05:16 +02:00
Paul Battley
01c2a989f1
Update form helper documentation to match code.
...
Change d3cfee11
2011-07-19 20:31:19 +01:00
Vijay Dev
4719543c80
reword select_date's behaviour clearly when an incomplete options array is passed
2011-07-20 00:03:28 +05:30
Vijay Dev
4885e5d3eb
minor corrections in form helpers guide and api docs
2011-07-20 00:03:28 +05:30
Jesse Storimer
ac81af40c0
Ensure that status codes are logged properly
...
Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
so that status codes rendered from rescue_from blocks are logged
properly.
2011-07-18 13:42:07 -04:00
Santiago Pastorino
adc7097dc0
Merge pull request #2124 from arunagw/render_partial_invalid_check_fix
...
Checking with to_s. As regexp fail with 1.8.7
2011-07-17 20:14:12 -07: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
