Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Failing tests for path parameter escaping | Jeremy Kemper | 2011-10-13 | 1 | -0/+27 |
| | |||||
* | Merge pull request #3314 from macmartine/master | Santiago Pastorino | 2011-10-13 | 2 | -1/+2 |
|\ | | | | | Remove user-specified delimiter from start when no area code is present (in number_to_phone) | ||||
| * | remove user-specified delimiter from start when no area code is present (in ↵ | Mac Martine | 2011-10-12 | 2 | -1/+2 |
| | | | | | | | | number_to_phone) | ||||
* | | Merge pull request #2219 from kommen/fix_fragment_caching_squashed | Santiago Pastorino | 2011-10-13 | 3 | -1/+51 |
|/ | | | | Fix fragment caching (squashed commits) | ||||
* | Add some implementation docs. closes #3298. closes #2509. | José Valim | 2011-10-12 | 1 | -0/+4 |
| | |||||
* | Support symbol and string actions in AC#respond_to options | Alexey Vakhov | 2011-10-11 | 2 | -4/+4 |
| | |||||
* | allow shorthand routes with nested optional parameters | Diego Carrion | 2011-10-10 | 2 | -3/+14 |
| | |||||
* | JSON responder should return errors with :error root | Denis Odorcic | 2011-10-10 | 2 | -1/+35 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-09 | 1 | -1/+1 |
|\ | |||||
| * | Fix params hash example in AC::Base comment | Alexey Vakhov | 2011-10-08 | 1 | -1/+1 |
| | | |||||
* | | Warnings removed when running with 1.9.3 | Arun Agrawal | 2011-10-09 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3262 from subdigital/master | José Valim | 2011-10-09 | 2 | -3/+26 |
|\ \ | | | | | | | Add optional host option to force_ssl | ||||
| * | | accept optional :host parameter to force_ssl | Ben Scheirman | 2011-10-08 | 2 | -3/+26 |
| | | | |||||
* | | | Merge pull request #3196 from avakhov/patch-am-av-tests-2 | José Valim | 2011-10-09 | 2 | -1/+22 |
|\ \ \ | | | | | | | | | Improve tests method for ActionView::TestCase and ActionMailer::TestCase | ||||
| * | | | normalize arg for ActionView::TestCase tests method | Alexey Vakhov | 2011-10-03 | 2 | -1/+22 |
| | | | | |||||
* | | | | Fixes an issue when creating a date select with too many options. | Liborio Cannici | 2011-10-08 | 3 | -5/+25 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by dlt https://github.com/dlt/rails/commit/9e615634745dc81598e7b880d52411338d3a7a93 Closes #239. Conflicts: actionpack/CHANGELOG | ||||
* | | | Remove unnecessary dup in expire_page | Alexey Vakhov | 2011-10-08 | 1 | -1/+1 |
| | | | |||||
* | | | just check to see that the first item in the list is an array | Aaron Patterson | 2011-10-07 | 2 | -1/+10 |
| | | | |||||
* | | | closes #3241 - partial doc fix | Vijay Dev | 2011-10-07 | 2 | -3/+3 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-07 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix comment in AbstractController callbacks | Alexey Vakhov | 2011-10-06 | 1 | -2/+2 |
| | | | |||||
* | | | fix require | Aaron Patterson | 2011-10-06 | 1 | -1/+1 |
| | | | |||||
* | | | stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't ↵ | Santiago Pastorino | 2011-10-05 | 2 | -0/+7 |
| | | | | | | | | | | | | throw Sprockets::FileOutsidePaths exception anymore | ||||
* | | | Do not require railtie as it messes up Rails.application setup. | José Valim | 2011-10-05 | 1 | -2/+1 |
|/ / | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-05 | 1 | -1/+1 |
|\ \ | |||||
| * | | missed underscore in AV::TestCase helper_method documentation | Alexey Vakhov | 2011-10-03 | 1 | -1/+1 |
| | | | |||||
* | | | Fix regression when calling helpers inside sprockets. | José Valim | 2011-10-05 | 4 | -8/+9 |
| | | | |||||
* | | | Fix the lame config.action_controller.present? check scattered throughout ↵ | José Valim | 2011-10-05 | 7 | -30/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | assets_path. Conflicts: actionpack/test/template/sprockets_helper_test.rb | ||||
* | | | Ensure default_asset_host_protocol is respected, closes #2980. | José Valim | 2011-10-05 | 4 | -8/+10 |
| | | | |||||
* | | | Encapsulate common rake invocation logic in a method. | José Valim | 2011-10-05 | 1 | -17/+14 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | added comment about why nondigest assets requires a reinvocation | Mark J. Titorenko | 2011-10-05 | 1 | -0/+5 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | only reinvoke if necessary | Mark J. Titorenko | 2011-10-05 | 1 | -2/+16 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | only execute the nondigest task if needed | Mark J. Titorenko | 2011-10-05 | 1 | -3/+3 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | don't munge the environment, let rake do that for us | Mark J. Titorenko | 2011-10-05 | 1 | -5/+3 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | assets compilation task refactoring | Mark J. Titorenko | 2011-10-05 | 2 | -30/+38 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | Fix failing test added in previous commit. | José Valim | 2011-10-04 | 1 | -4/+12 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | Bump sprockets to 2.0.2 | Santiago Pastorino | 2011-10-04 | 1 | -11/+11 |
| | | | |||||
* | | | Clean up subdomain code a bit. | José Valim | 2011-10-04 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #3209 from ksob/subdomain_false_strips_subdomains | José Valim | 2011-10-04 | 4 | -5/+23 |
|\ \ \ | | | | | | | | | :subdomain => false will remove all subdomains now. Closes #2025 | ||||
| * | | | :subdomain can now be specified with a value of false in url_for, allowing ↵ | Kamil Sobieraj | 2011-10-04 | 4 | -5/+23 |
| | | | | | | | | | | | | | | | | for subdomain(s) removal from the host during link generation. Closes #2025 | ||||
* | | | | Fix failing tests and refactor assets.rake | José Valim | 2011-10-04 | 1 | -24/+37 |
|/ / / | |||||
* | | | Require rack-cache 1.1. | Brendan Ribera | 2011-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Versions prior to 1.1 delete the If-Modified-Since and If-Not-Modified headers when config.action_controller.perform_caching is true. This has two problems: * unexpected inconsistent behaviour between development & production environments * breaks applications that use of these headers | ||||
* | | | Fix #3198. | José Valim | 2011-10-03 | 1 | -39/+35 |
| |/ |/| | |||||
* | | Ensure that enhancements to assets:precompile task are only run once | Sam Pohlenz | 2011-10-03 | 1 | -0/+2 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantize | José Valim | 2011-10-03 | 1 | -3/+1 |
|\ \ | | | | | | | use safe_constantize instead constantize in AC::TestCase | ||||
| * | | use safe_constantize instead constantize in AC::TestCase | Alexey Vakhov | 2011-10-03 | 1 | -3/+1 |
| | | | |||||
* | | | normalize arg for AC::TestCase tests class method | Alexey Vakhov | 2011-10-03 | 2 | -2/+30 |
|/ / | |||||
* | | :group => :assets should only run in the assets environment. | José Valim | 2011-10-02 | 1 | -1/+1 |
| | | |||||
* | | Provide initialize_on_precompile which, when set to false, does not ↵ | José Valim | 2011-10-02 | 1 | -2/+6 |
| | | | | | | | | initialize the app for precompilation. Defaults to true. | ||||
* | | TestCase should respect the view_assigns API instead of pulling variables on ↵ | José Valim | 2011-10-02 | 3 | -8/+23 |
| | | | | | | | | its own. |