aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3314 from macmartine/masterSantiago Pastorino2011-10-132-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 Martine2011-10-122-1/+2
| | | | | | | | number_to_phone)
* | Merge pull request #2219 from kommen/fix_fragment_caching_squashedSantiago Pastorino2011-10-133-1/+51
|/ | | | Fix fragment caching (squashed commits)
* Add some implementation docs. closes #3298. closes #2509.José Valim2011-10-121-0/+4
|
* Support symbol and string actions in AC#respond_to optionsAlexey Vakhov2011-10-112-4/+4
|
* allow shorthand routes with nested optional parametersDiego Carrion2011-10-102-3/+14
|
* JSON responder should return errors with :error rootDenis Odorcic2011-10-102-1/+35
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-091-1/+1
|\
| * Fix params hash example in AC::Base commentAlexey Vakhov2011-10-081-1/+1
| |
* | Warnings removed when running with 1.9.3Arun Agrawal2011-10-091-1/+1
| |
* | Merge pull request #3262 from subdigital/masterJosé Valim2011-10-092-3/+26
|\ \ | | | | | | Add optional host option to force_ssl
| * | accept optional :host parameter to force_sslBen Scheirman2011-10-082-3/+26
| | |
* | | Merge pull request #3196 from avakhov/patch-am-av-tests-2José Valim2011-10-092-1/+22
|\ \ \ | | | | | | | | Improve tests method for ActionView::TestCase and ActionMailer::TestCase
| * | | normalize arg for ActionView::TestCase tests methodAlexey Vakhov2011-10-032-1/+22
| | | |
* | | | Fixes an issue when creating a date select with too many options.Liborio Cannici2011-10-083-5/+25
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by dlt https://github.com/dlt/rails/commit/9e615634745dc81598e7b880d52411338d3a7a93 Closes #239. Conflicts: actionpack/CHANGELOG
* | | Remove unnecessary dup in expire_pageAlexey Vakhov2011-10-081-1/+1
| | |
* | | just check to see that the first item in the list is an arrayAaron Patterson2011-10-072-1/+10
| | |
* | | closes #3241 - partial doc fixVijay Dev2011-10-072-3/+3
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-071-2/+2
|\ \
| * | Fix comment in AbstractController callbacksAlexey Vakhov2011-10-061-2/+2
| | |
* | | fix requireAaron Patterson2011-10-061-1/+1
| | |
* | | stylesheet_link_tag('/stylesheets/application') and similar helpers doesn't ↵Santiago Pastorino2011-10-052-0/+7
| | | | | | | | | | | | throw Sprockets::FileOutsidePaths exception anymore
* | | Do not require railtie as it messes up Rails.application setup.José Valim2011-10-051-2/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-051-1/+1
|\ \
| * | missed underscore in AV::TestCase helper_method documentationAlexey Vakhov2011-10-031-1/+1
| | |
* | | Fix regression when calling helpers inside sprockets.José Valim2011-10-054-8/+9
| | |
* | | Fix the lame config.action_controller.present? check scattered throughout ↵José Valim2011-10-057-30/+32
| | | | | | | | | | | | | | | | | | | | | | | | assets_path. Conflicts: actionpack/test/template/sprockets_helper_test.rb
* | | Ensure default_asset_host_protocol is respected, closes #2980.José Valim2011-10-054-8/+10
| | |
* | | Encapsulate common rake invocation logic in a method.José Valim2011-10-051-17/+14
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | added comment about why nondigest assets requires a reinvocationMark J. Titorenko2011-10-051-0/+5
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | only reinvoke if necessaryMark J. Titorenko2011-10-051-2/+16
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | only execute the nondigest task if neededMark J. Titorenko2011-10-051-3/+3
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | don't munge the environment, let rake do that for usMark J. Titorenko2011-10-051-5/+3
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | assets compilation task refactoringMark J. Titorenko2011-10-052-30/+38
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Fix failing test added in previous commit.José Valim2011-10-041-4/+12
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Bump sprockets to 2.0.2Santiago Pastorino2011-10-041-11/+11
| | |
* | | Clean up subdomain code a bit.José Valim2011-10-041-2/+2
| | |
* | | Merge pull request #3209 from ksob/subdomain_false_strips_subdomainsJosé Valim2011-10-044-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 Sobieraj2011-10-044-5/+23
| | | | | | | | | | | | | | | | for subdomain(s) removal from the host during link generation. Closes #2025
* | | | Fix failing tests and refactor assets.rakeJosé Valim2011-10-041-24/+37
|/ / /
* | | Require rack-cache 1.1.Brendan Ribera2011-10-031-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é Valim2011-10-031-39/+35
| |/ |/|
* | Ensure that enhancements to assets:precompile task are only run onceSam Pohlenz2011-10-031-0/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantizeJosé Valim2011-10-031-3/+1
|\ \ | | | | | | use safe_constantize instead constantize in AC::TestCase
| * | use safe_constantize instead constantize in AC::TestCaseAlexey Vakhov2011-10-031-3/+1
| | |
* | | normalize arg for AC::TestCase tests class methodAlexey Vakhov2011-10-032-2/+30
|/ /
* | :group => :assets should only run in the assets environment.José Valim2011-10-021-1/+1
| |
* | Provide initialize_on_precompile which, when set to false, does not ↵José Valim2011-10-021-2/+6
| | | | | | | | initialize the app for precompilation. Defaults to true.
* | TestCase should respect the view_assigns API instead of pulling variables on ↵José Valim2011-10-023-8/+23
| | | | | | | | its own.
* | Use of :: in void context Warning removedArun Agrawal2011-10-011-1/+1
| |