Commit Graph

7321 Commits

Author SHA1 Message Date
Ilya Grigorik
ed5c6d254c generate environment dependent asset digests
If two different environments are configured to use the pipeline, but
one has an extra step (such as compression) then without taking the
environment into account you may end up serving wrong assets
2011-08-04 23:53:32 -04:00
Ilya Grigorik
e44efac086 Clear out tmp/cache when assets:clean is invoked.
Otherwise, if bad data is cached in tmp/clear then the next invocation
of assets:precompile (or a regular incoming request) will pickup files from
tmp without regenerating them from source.
2011-08-04 23:53:32 -04:00
Rashmi Yadav
681d919e48 The trailing '/' isn't being picked up by Github anyway, and the link works as is. 2011-08-04 16:41:31 -07:00
Vijay Dev
d8c77fa16c document meta method 2011-08-04 16:40:25 -07:00
Santiago Pastorino
d7e55c3429 Merge pull request #2421 from pivotal-casebook/master
Simple_format should not edit it in place. (Fixes https://github.com/rails/rails/issues/1980)
2011-08-04 11:49:43 -07:00
Casebook Developer
f0034c75d5 ActionView::Helpers::TextHelper#simple_format should not change the text in place. Now it duplicates it. 2011-08-04 13:34:47 -04:00
Santiago Pastorino
cf96649bb7 Merge pull request #2356 from waynn/fix_symbol
fix stringify_keys destructive behavior for most FormTagHelper functions
2011-08-04 09:29:18 -07:00
Waynn Lue
54b83566cc fix stringify_keys destructive behavior for most FormTagHelper functions
add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355
2011-08-03 20:53:55 -07:00
thoefer
860202e8b2 Fix the issue where default_url_options is being cached on test cases. Closes #1872. Closes #2031.
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-08-01 11:49:24 +02:00
José Valim
dc8773b19f Rename new method to_path to to_partial_path to avoid conflicts with File#to_path and similar. 2011-08-01 11:42:00 +02:00
Santiago Pastorino
d701b3fa47 Merge pull request #2379 from arunagw/extra_require_removal
Removing extra requires from the test. Already loaded in abstract_unit.
2011-07-31 11:50:52 -07:00
Arun Agrawal
ec7457ed2a Removing extra requires from the test. Already loaded in abstract_unit. 2011-07-31 23:36:21 +05:30
Vishnu Atrai
070513016f remove extra require for 'active_support/dependencies' as it is required in abstract_unit.rb 2011-07-31 23:12:28 +05:30
Waynn Lue
1f270e80e6 remove redundant calls to stringify_keys 2011-07-29 17:07:27 -07:00
Brian Cardarella
1c94ba0332 Instead of removing the instance variable just set it to nil, resolves the warnings because of a missing instance variable 2011-07-29 12:08:35 -04:00
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
Xavier Noria
5eeae68657 contrib app minor tweak 2011-07-27 13:25:08 -07: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
Damien Mathieu
945f0c82af use sprocket's append_path and assert_match 2011-07-26 16:59:15 +02: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
Santiago Pastorino
155bb7c75d Bump sprockets up 2011-07-26 00:42:31 -03:00
Santiago Pastorino
36ab1cd293 Bump rack up. Closes #2107 2011-07-25 23:03:30 -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
Aaron Patterson
36fd3fdf46 no need for an anonymous class on every setup call 2011-07-25 09:07:46 -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