aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebufferJosé Valim2011-06-071-1/+2
|\ | | | | Don't operate on the safebuffer, operate on a string and convert.
| * Don't operate on the safebuffer, operate on a string and convert.Christopher Meiklejohn2011-06-071-1/+2
| |
* | remove warning: assigned but unused variableSantiago Pastorino2011-06-0813-19/+10
| |
* | Fragment caching needs to operate on the pure output, not theChristopher Meiklejohn2011-06-071-1/+3
|/ | | | safebuffer.
* Update asset helpers to use `config.assets.prefix` Joshua Peek2011-06-071-2/+2
| | | Fixes #1489
* Added missing assert to test checking form with namespaced isolated model ↵Piotr Sarnacki2011-06-072-6/+6
| | | | and fixed helpers to work correctly in such case
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-069-14/+13
|\ | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS
| * Remove trailing white-spacesGuillermo Iguaran2011-06-055-6/+5
| |
| * some grammatical correctionsVijay Dev2011-06-041-3/+3
| |
| * Removing trailing white-spacesGuillermo Iguaran2011-05-311-2/+2
| |
| * The example in the API docs incorrectly indicated that form_for would use ↵Mark Roghelia2011-05-311-2/+2
| | | | | | | | the same default route for both new and previously persisted records. The default path given in the example would have generated a routing error for new records. form_for actually uses polymorphic_path to determine which route to use based on the state of the record. The example has been updated to reflect the method's actual behavior.
| * Added missing quote in grouped_options_for_select examplediego2011-05-261-1/+1
| |
* | Use Latest Sprockets betaDavid Heinemeier Hansson2011-06-061-1/+1
| |
* | Move CHANGELOG entry to future versionAndrew White2011-06-051-1/+4
| |
* | Add backward compatibility for testing cookiesAndrew White2011-06-054-5/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit restores the ability to assign cookies for testing via @request.env['HTTP_COOKIE'] and @request.cookies, e.g: @request.env['HTTP_COOKIE'] = 'user_name=david' get :index assert_equal 'david', cookies[:user_name] and @request.cookies[:user_name] = 'david' get :index assert_equal 'david', cookies[:user_name] Assigning via cookies[] is the preferred method and will take precedence over the other two methods. This is so that cookies set in controller actions have precedence and are carried over between calls to get, post, etc.
* | Ensure cookie keys are stringsAndrew White2011-06-052-2/+12
| |
* | Merge pull request #1426 from arunagw/sprockets_gem_updateJosé Valim2011-06-051-1/+1
|\ \ | | | | | | sprockets gem update to beta9
| * | sprockets gem update to beta9 Arun Agrawal2011-05-311-1/+1
| | |
* | | Allow multiple sources in Sprockets helpersGuillermo Iguaran2011-06-054-28/+40
| | |
* | | Add missing require for cookies middlewareAndrew White2011-06-041-0/+1
| | |
* | | Refactor ActionController::TestCase cookiesAndrew White2011-06-048-65/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning cookies for test cases should now use cookies[], e.g: cookies[:email] = 'user@example.com' get :index assert_equal 'user@example.com', cookies[:email] To clear the cookies, use clear, e.g: cookies.clear get :index assert_nil cookies[:email] We now no longer write out HTTP_COOKIE and the cookie jar is persistent between requests so if you need to manipulate the environment for your test you need to do it before the cookie jar is created.
* | | Merge pull request #1447 from dmathieu/empty_routePiotr Sarnacki2011-06-012-1/+9
|\ \ \ | | | | | | | | Fix creating an empty route on 1.8. Closes #1210
| * | | fix creating an empty route on 1.8. Closes #1210Damien Mathieu2011-06-012-1/+9
| |/ /
* | | Merge pull request #1448 from ernie/attr_internal_requireJosé Valim2011-06-011-0/+2
|\ \ \ | |/ / |/| | Require attr_internal before using in ActionView::Helpers
| * | Require attr_internal before using in ActionView::HelpersErnie Miller2011-06-011-0/+2
| | |
* | | Remove autoload for a couple of constants which don't exist anymorebrainopia2011-05-311-5/+0
| | |
* | | Corrected some typos and American vs. Queen's English issuesLee Reilly2011-05-292-6/+6
| | |
* | | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-testsJosé Valim2011-05-282-0/+29
|\ \ \ | | | | | | | | Stringify param values in controller tests.
| * | | use to_param (and change method to name accordingly)David Chelimsky2011-05-221-8/+8
| | | | | | | | | | | | | | | | | | | | - exclude Rack::Test::UploadedFile to pass existing tests. Are there any other types we're missing?
| * | | Stringify param values in controller tests.David Chelimsky2011-05-222-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces false positives that come from using ints in params in tests, which do not get converted to strings in the tests. In implementations going through rack, they do get converted to strings. - David Chelimsky and Sam Umbach
* | | | Fix typo in test.Andrés Botero2011-05-281-1/+1
| | | |
* | | | fixed asset_paths when called from sprockets for relative_url_rootjacott2011-05-283-11/+13
| | | |
* | | | Merge pull request #1324 from dmathieu/no_error_on_invalid_formatJosé Valim2011-05-262-1/+7
|\ \ \ \ | | | | | | | | | | Don't raise an exception if the format isn't recognized
| * | | | don't raise an exception if the format isn't recognizeddmathieu2011-05-262-1/+7
| | | | | | | | | | | | | | | | | | | | Fixed while traveling to heuruko
* | | | | Merge pull request #1311 from kuldarkrabbi/masterJosé Valim2011-05-251-1/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | action_view/template/handler.rb has been removed
| * | | | action_view/template/handler has been removedKuldar Krabbi2011-05-251-1/+0
| |/ / /
* | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2524-63/+63
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * | | changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme ↵Karunakar (Ruby)2011-05-241-1/+1
| | | | | | | | | | | | | | | | files
| * | | fix minor spelling mistakes in commentsDmytrii Nagirniak2011-05-231-3/+3
| | | |
| * | | Remove extra white spaces on ActionPack docs.Sebastian Martinez2011-05-2322-53/+53
| | | |
| * | | Fixed documentation for scope with path.Anuj Dutta2011-05-221-2/+2
| | | |
| * | | fixes code highlight in shallow_path exampleDiego Plentz2011-05-191-4/+4
| | | |
* | | | Move SCSS generators and default templates from Rails to the Sass Railtie ↵tomhuda2011-05-241-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (d435726312601edb3ba6f97b34f562221f72c1f8). * Sass gem registers a compressor * Sass gem registers generators for assets and scaffold * Create a default stylesheet_engine ("css") for apps that remove the Sass gem
* | | | Change compressor API so that plugins can register default compressors for ↵tomhuda2011-05-241-3/+4
| | | | | | | | | | | | | | | | their stylesheet or JS engines and still allow the user to turn off compression
* | | | corrected the ActionMailer tests which broke due to some code removed from ↵Josh Kalderimis2011-05-251-0/+1
| | | | | | | | | | | | | | | | ActionPack
* | | | removed deprecated methods, and related tests, from ActionPackJosh Kalderimis2011-05-2417-213/+6
| | | |
* | | | fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0Vijay Dev2011-05-241-2/+2
| | | |
* | | | Redundant condition in compute_asset_host is redundant.Ernie Miller2011-05-241-3/+3
| |_|/ |/| |
* | | Remaining cleanup from changes to AssetTagHelpertomhuda2011-05-244-12/+9
| | |
* | | Make sure that Sprockets::Helpers::RailsHelper can be foundwycats2011-05-232-1/+8
| | |