aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Undid previous change which violated the convention regarding output (use "# ...Manuel Menezes de Sequeira2011-10-061-13/+13
* Some small corrections and improvements to the text.Manuel Menezes de Sequeira2011-10-051-30/+32
* Merge branch 'master' of github.com:lifo/docrailsManuel Menezes de Sequeira2011-10-0575-247/+677
|\
| * Update Rails routing guide to mention that `redirect()` is a 301 permanent re...Prem Sichanugrist2011-10-051-0/+2
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-0510-191/+241
| |\
| | * copy editingVijay Dev2011-10-053-9/+6
| * | Merge pull request #3229 from amatsuda/string_prependJosé Valim2011-10-051-11/+13
| |\ \
| | * | ruby193: String#prepend is also unsafeAkira Matsuda2011-10-051-1/+1
| | * | override unsafe methods only if defined on StringAkira Matsuda2011-10-051-10/+12
| * | | Fix regression when calling helpers inside sprockets.José Valim2011-10-055-10/+11
| |/ /
| * | Fix the lame config.action_controller.present? check scattered throughout ass...José Valim2011-10-057-30/+32
| * | Raise error on unknown primary key.Jon Leighton2011-10-0512-18/+54
| * | 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
| * | added comment about why nondigest assets requires a reinvocationMark J. Titorenko2011-10-051-0/+5
| * | only reinvoke if necessaryMark J. Titorenko2011-10-051-2/+16
| * | only execute the nondigest task if neededMark J. Titorenko2011-10-051-3/+3
| * | don't munge the environment, let rake do that for usMark J. Titorenko2011-10-051-5/+3
| * | assets compilation task refactoringMark J. Titorenko2011-10-052-30/+38
| * | Fix failing test added in previous commit.José Valim2011-10-041-4/+12
| * | correct path used in "digested assets are not mistakenly removed" testMark J. Titorenko2011-10-041-1/+1
| * | add failing test: "digested assets are removed from configured path"Mark J. Titorenko2011-10-041-0/+13
| * | Bump sprockets to 2.0.2Santiago Pastorino2011-10-041-11/+11
| * | Merge pull request #3212 from ayrton/masterSantiago Pastorino2011-10-041-1/+1
| |\ \
| | * | to_formatted_s is an instance method for a Range not an ArrayAyrton De Craene2011-10-041-1/+1
| |/ /
| * | 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 can now be specified with a value of false in url_for, allowing fo...Kamil Sobieraj2011-10-044-5/+23
| * | | Fix failing tests and refactor assets.rakeJosé Valim2011-10-042-25/+38
| * | | Changing rake db:schema:dump to run :environment as well as :load_config, as ...Ben Woosley2011-10-041-1/+1
| |/ /
| * | Merge pull request #3202 from abscondment/3053-missing-headersJosé Valim2011-10-032-1/+15
| |\ \
| | * | Require rack-cache 1.1.Brendan Ribera2011-10-031-1/+1
| | * | Test demonstrating #3053: If-Modified-Since gets swallowed up by rack-cache.Brendan Ribera2011-10-031-0/+14
| |/ /
| * | Merge pull request #2801 from jeremyevans/patch-1Jeremy Kemper2011-10-032-1/+4
| |\ \
| | * | Add tests for fixes to Time.===Jeremy Evans2011-09-071-0/+3
| | * | Edited activesupport/lib/active_support/core_ext/time/calculations.rb via GitHubJeremy Evans2011-09-011-1/+1
| * | | Merge pull request #3191 from yahonda/activerecord_unittest_db2Aaron Patterson2011-10-032-0/+5
| |\ \ \
| | * | | Fix typo in RakefileYasuo Honda2011-10-031-1/+1
| | * | | To support ActiveRecord unit tests for IBM DB2Yasuo Honda2011-10-022-0/+5
| * | | | Fix #3198.José Valim2011-10-031-39/+35
| * | | | add failing test for #3198Mark J. Titorenko2011-10-031-0/+13
| * | | | Merge pull request #3200 from docwhat/spelling-boobooSantiago Pastorino2011-10-031-1/+1
| |\ \ \ \
| | * | | | Rescuable spelling errorChristian Höltje2011-10-031-1/+1
| |/ / / /
| * | | | Ensure that enhancements to assets:precompile task are only run onceSam Pohlenz2011-10-032-0/+8
| * | | | Replace calls to capture(:stdout) with quietly in assets testsSam Pohlenz2011-10-031-4/+4
| * | | | Merge pull request #3193 from avakhov/patch-ac-test-case-safe-constantizeJosé Valim2011-10-031-3/+1
| |\ \ \ \
| | * | | | use safe_constantize instead constantize in AC::TestCaseAlexey Vakhov2011-10-031-3/+1
| | |/ / /
| * | | | Merge pull request #3194 from avakhov/patch-ac-test-case-testsJosé Valim2011-10-032-2/+30
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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-025-7/+8