Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace the reference to the annotate_models plugin (unchanged since 2008) ↵ | mhutchin | 2011-10-07 | 1 | -1/+5 |
| | | | | with more current annotate_models gem | ||||
* | More understandable warning in the local_constant_names section | Dimitar Dimitrov | 2011-10-07 | 1 | -2/+2 |
| | | | Rewrite the warning about local_constant_names in Ruby 1.8 to make it more understandable. Word ordering fixes in the same section. | ||||
* | Clarifying ambiguous description of require_self in the asset pipeline | clay shentrup | 2011-10-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Manuel Menezes de Sequeira | 2011-10-06 | 6 | -9/+65 |
|\ | |||||
| * | fix an example | Vijay Dev | 2011-10-06 | 1 | -1/+1 |
| | | |||||
| * | Fix comment in AbstractController callbacks | Alexey Vakhov | 2011-10-06 | 1 | -2/+2 |
| | | |||||
| * | Grammar fixes for the routing guide. | Hendy Tanata | 2011-10-06 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Ryan Bigg | 2011-10-06 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | * 'master' of github.com:lifo/docrails: use Rails.root.join for assets guide | ||||
| | * | use Rails.root.join for assets guide | Nick Quaranto | 2011-10-05 | 1 | -1/+1 |
| | | | |||||
| * | | [config guide] Show example of defining initialization hooks | Ryan Bigg | 2011-10-06 | 1 | -0/+19 |
| | | | |||||
| * | | [config guide] mention that to_prepare hooks are called upon every request ↵ | Ryan Bigg | 2011-10-06 | 1 | -1/+1 |
| |/ | | | | | | | in dev, but only once in production | ||||
| * | [engines guide] More explanation for 'Generating an engine' | Ryan Bigg | 2011-10-06 | 1 | -2/+20 |
| | | |||||
| * | [engines] Expanded 'What are engines?' and 'Generating an engine' sections | Ryan Bigg | 2011-10-06 | 1 | -2/+21 |
| | | |||||
* | | Undid previous change which violated the convention regarding output (use "# ↵ | Manuel Menezes de Sequeira | 2011-10-06 | 1 | -13/+13 |
|/ | | | | =>") used in these guides. Corrected typo in previous correction. (Thanks for pointing this out, vijaydev.) | ||||
* | Some small corrections and improvements to the text. | Manuel Menezes de Sequeira | 2011-10-05 | 1 | -30/+32 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Manuel Menezes de Sequeira | 2011-10-05 | 75 | -247/+677 |
|\ | |||||
| * | Update Rails routing guide to mention that `redirect()` is a 301 permanent ↵ | Prem Sichanugrist | 2011-10-05 | 1 | -0/+2 |
| | | | | | | | | | | | | redirect I had to try out myself to realize that it's 301, so this should be helpful to everyone. | ||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-05 | 10 | -191/+241 |
| |\ | |||||
| | * | copy editing | Vijay Dev | 2011-10-05 | 3 | -9/+6 |
| | | | |||||
| * | | Merge pull request #3229 from amatsuda/string_prepend | José Valim | 2011-10-05 | 1 | -11/+13 |
| |\ \ | | | | | | | | | ruby193: String#prepend | ||||
| | * | | ruby193: String#prepend is also unsafe | Akira Matsuda | 2011-10-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | override unsafe methods only if defined on String | Akira Matsuda | 2011-10-05 | 1 | -10/+12 |
| | | | | |||||
| * | | | Fix regression when calling helpers inside sprockets. | José Valim | 2011-10-05 | 5 | -10/+11 |
| |/ / | |||||
| * | | 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 | ||||
| * | | Raise error on unknown primary key. | Jon Leighton | 2011-10-05 | 12 | -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é 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> | ||||
| * | | correct path used in "digested assets are not mistakenly removed" test | Mark J. Titorenko | 2011-10-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | add failing test: "digested assets are removed from configured path" | Mark J. Titorenko | 2011-10-04 | 1 | -0/+13 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Bump sprockets to 2.0.2 | Santiago Pastorino | 2011-10-04 | 1 | -11/+11 |
| | | | |||||
| * | | Merge pull request #3212 from ayrton/master | Santiago Pastorino | 2011-10-04 | 1 | -1/+1 |
| |\ \ | | | | | | | | | incorrect to_formatted_s example | ||||
| | * | | to_formatted_s is an instance method for a Range not an Array | Ayrton De Craene | 2011-10-04 | 1 | -1/+1 |
| |/ / | |||||
| * | | 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 | 2 | -25/+38 |
| | | | | |||||
| * | | | Changing rake db:schema:dump to run :environment as well as :load_config, as ↵ | Ben Woosley | 2011-10-04 | 1 | -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-headers | José Valim | 2011-10-03 | 2 | -1/+15 |
| |\ \ | | | | | | | | | Use rack-cache 1.1 | ||||
| | * | | 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 | ||||
| | * | | Test demonstrating #3053: If-Modified-Since gets swallowed up by rack-cache. | Brendan Ribera | 2011-10-03 | 1 | -0/+14 |
| |/ / | |||||
| * | | Merge pull request #2801 from jeremyevans/patch-1 | Jeremy Kemper | 2011-10-03 | 2 | -1/+4 |
| |\ \ | | | | | | | | | Fix obviously breakage of Time.=== for Time subclasses | ||||
| | * | | Add tests for fixes to Time.=== | Jeremy Evans | 2011-09-07 | 1 | -0/+3 |
| | | | | |||||
| | * | | Edited activesupport/lib/active_support/core_ext/time/calculations.rb via GitHub | Jeremy Evans | 2011-09-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #3191 from yahonda/activerecord_unittest_db2 | Aaron Patterson | 2011-10-03 | 2 | -0/+5 |
| |\ \ \ | | | | | | | | | | | To support ActiveRecord unit tests for IBM DB2 |