aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' of github.com:lifo/docrailsManuel Menezes de Sequeira2011-10-052-4/+4
| |\ \
| | * | Corrections to Active Record Validations and Callbacks guide.Hendy Tanata2011-10-051-3/+3
| | | |
| | * | Merge branch 'master' of github.com:lifo/docrailsRobert Ross2011-10-041-0/+36
| | |\ \
| | * | | Change one more place for JSON string to HashRobert Ross2011-10-041-1/+1
| | | | |
| | * | | Fix as_json doc to say what it actually returns.Robert Ross2011-10-041-1/+1
| | | | |
| * | | | s/help/helper/Manuel Menezes de Sequeira2011-10-051-1/+1
| | |/ / | |/| |
| * | | [engines guide] initial layoutRyan Bigg2011-10-051-0/+36
| |/ /
| * | More corrections and clarifications to the Active Record Validations and ↵Manuel Menezes de Sequeira2011-10-041-39/+52
| | | | | | | | | | | | Callbacks guide.
| * | Several small corrections and clarifications to the Active Record ↵Manuel Menezes de Sequeira2011-10-031-16/+18
| | | | | | | | | | | | Validations and Callbacks guide.
| * | Several small corrections and improvements to the Migrations and Active ↵Manuel Menezes de Sequeira2011-10-032-60/+59
| | | | | | | | | | | | Record Basics guides.
| * | missed underscore in AV::TestCase helper_method documentationAlexey Vakhov2011-10-031-1/+1
| | |
| * | Several other small corrections.Manuel Menezes de Sequeira2011-10-011-30/+31
| | |
| * | Several small corrections and clarifications.Manuel Menezes de Sequeira2011-10-011-29/+31
| | |
| * | Small typo corrected.Manuel Menezes de Sequeira2011-09-301-3/+3
| | |
| * | Class name specified in example is Person, not AttributePerson.Uģis Ozols2011-09-291-3/+3
| | |
| * | Corrected a typo.Michael Hutchinson2011-09-271-1/+1
| | |
| * | Make case in configuration document consistentJustin Leitgeb2011-09-271-9/+9
| | |
* | | Merge pull request #3229 from amatsuda/string_prependJosé Valim2011-10-051-11/+13
|\ \ \ | | | | | | | | ruby193: String#prepend
| * | | 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 ↵José Valim2011-10-057-30/+32
| | | | | | | | | | | | | | | | | | | | | | | | assets_path. Conflicts: actionpack/test/template/sprockets_helper_test.rb
* | | Raise error on unknown primary key.Jon Leighton2011-10-0512-18/+54
| | | | | | | | | | | | | | | If we don't have a primary key when we ask for it, it's better to fail fast. Fixes GH #2307.
* | | 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>
* | | correct path used in "digested assets are not mistakenly removed" testMark J. Titorenko2011-10-041-1/+1
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | add failing test: "digested assets are removed from configured path"Mark J. Titorenko2011-10-041-0/+13
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Bump sprockets to 2.0.2Santiago Pastorino2011-10-041-11/+11
| | |
* | | Merge pull request #3212 from ayrton/masterSantiago Pastorino2011-10-041-1/+1
|\ \ \ | | | | | | | | incorrect to_formatted_s example
| * | | 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 => 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-042-25/+38
| | |
* | | Changing rake db:schema:dump to run :environment as well as :load_config, as ↵Ben Woosley2011-10-041-1/+1
|/ / | | | | | | | | | | | | | | | | | | running :load_config alone will lead to the dumper being run without including extensions such as those included in foreigner and spatial_adapter. This reverses a change made here: https://github.com/rails/rails/commit/5df72a238e9fcb18daf6ab6e6dc9051c9106d7bb#L0L324 I'm assuming here that :load_config needs to be invoked separately from :environment, as it is elsewhere in the file for db operations, if not the alternative is to go back to "task :dump => :environment do". Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge pull request #3202 from abscondment/3053-missing-headersJosé Valim2011-10-032-1/+15
|\ \ | | | | | | Use rack-cache 1.1
| * | 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
| * | 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
|\ \ | | | | | | Fix obviously breakage of Time.=== for Time subclasses
| * | 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
|\ \ \ | | | | | | | | To support ActiveRecord unit tests for IBM DB2
| * | | Fix typo in RakefileYasuo Honda2011-10-031-1/+1
| | | |
| * | | To support ActiveRecord unit tests for IBM DB2Yasuo Honda2011-10-022-0/+5
| | | |