Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sprockets' | Joshua Peek | 2011-04-12 | 19 | -9/+278 |
|\ | |||||
| * | Index sprockets environment if perform caching is enabled | Joshua Peek | 2011-04-12 | 2 | -0/+7 |
| | | |||||
| * | Merge branch 'master' into sprockets | Joshua Peek | 2011-04-12 | 184 | -1013/+2597 |
| |\ | |||||
| * | | Fix assets prefix joining | Joshua Peek | 2011-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | Fix assets prefix joining | Joshua Peek | 2011-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | Fix config.assets.precompile option | Joshua Peek | 2011-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | Unify sprockets config options | Joshua Peek | 2011-03-30 | 4 | -18/+25 |
| | | | |||||
| * | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 81 | -196/+1117 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb | ||||
| * \ \ | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 96 | -608/+1729 |
| |\ \ \ | |||||
| * | | | | Switch to sprockets/master | Joshua Peek | 2011-03-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Precompile configured assets | Joshua Peek | 2011-03-29 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Seperate asset directories | Joshua Peek | 2011-03-29 | 8 | -16/+21 |
| | | | | | |||||
| * | | | | Rename option to config.asset_pipeline | Joshua Peek | 2011-03-29 | 5 | -19/+23 |
| | | | | | |||||
| * | | | | Move sprockets initializers back to application | Joshua Peek | 2011-03-29 | 5 | -51/+41 |
| | | | | | |||||
| * | | | | Change back to /assets prefix | Joshua Peek | 2011-03-29 | 2 | -13/+10 |
| | | | | | |||||
| * | | | | Fix building route set with sprockets in production | Joshua Peek | 2011-03-29 | 1 | -2/+14 |
| | | | | | |||||
| * | | | | Only add fingerprints if perform_caching is on | Joshua Peek | 2011-03-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix sprockets logger | Joshua Peek | 2011-03-29 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Copy use_sprockets config | Joshua Peek | 2011-03-29 | 2 | -2/+3 |
| | | | | | |||||
| * | | | | Use sprockets helpers if config.use_sprockets is set | Joshua Peek | 2011-03-29 | 2 | -6/+22 |
| | | | | | |||||
| * | | | | Add sprockets to Gemfile for testing | Joshua Peek | 2011-03-29 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Tests for SprocketsHelper | Joshua Peek | 2011-03-29 | 8 | -5/+104 |
| | | | | | |||||
| * | | | | Update sprockets path generation method | Joshua Peek | 2011-03-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add SprocketsHelper | Joshua Peek | 2011-03-28 | 2 | -0/+79 |
| | | | | | |||||
| * | | | | Remove sprockets exception from main asset helpers | Joshua Peek | 2011-03-28 | 2 | -20/+0 |
| | | | | | |||||
| * | | | | Fix reference to config.use_sprockets | Joshua Peek | 2011-03-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add use_sprockets flag | Joshua Peek | 2011-03-28 | 3 | -5/+8 |
| | | | | | |||||
| * | | | | Logger isn't set here | Joshua Peek | 2011-03-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add route for assets | Joshua Peek | 2011-03-28 | 2 | -34/+35 |
| | | | | | |||||
| * | | | | Change static root to /public | Joshua Peek | 2011-03-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use sprockets precompile | Joshua Peek | 2011-03-22 | 1 | -10/+2 |
| | | | | | |||||
| * | | | | Move app/javascripts and app/stylesheets under app/assets | Joshua Peek | 2011-03-22 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | Add sprockets md5s to asset tags | Joshua Peek | 2011-03-22 | 2 | -0/+20 |
| | | | | | |||||
| * | | | | Remove ensure_fresh_assets flag | Joshua Peek | 2011-03-22 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Assign sprockets static root | Joshua Peek | 2011-03-22 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Need to load assets task file | Joshua Peek | 2011-03-21 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add sprockets task to compile assets | Joshua Peek | 2011-03-21 | 2 | -1/+17 |
| | | | | | |||||
| * | | | | Add sprockets environment to Application | Joshua Peek | 2011-03-21 | 1 | -0/+34 |
| | | | | | |||||
* | | | | | common @jonleighton :bomb: | Aaron Patterson | 2011-04-12 | 1 | -2/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Deprecate defining scopes with a callable (lambda, proc, etc) via the scope ↵ | Jon Leighton | 2011-04-12 | 6 | -23/+116 |
| | | | | | | | | | | | | | | | | class method. Just define a class method yourself instead. | ||||
* | | | | ActiveRecord::Base.scopes hash is not needed | Jon Leighton | 2011-04-12 | 3 | -29/+4 |
| | | | | |||||
* | | | | Evaluate default scopes at the last possible moment in order to avoid ↵ | Jon Leighton | 2011-04-12 | 10 | -33/+67 |
| | | | | | | | | | | | | | | | | problems with default scopes getting included into other scopes and then being unable to remove the default part via unscoped. | ||||
* | | | | Deprecated support for passing hashes and relations to default_scope, in ↵ | Jon Leighton | 2011-04-12 | 17 | -172/+410 |
| | | | | | | | | | | | | | | | | favour of defining a 'default_scope' class method in the model. See the CHANGELOG for more details. | ||||
* | | | | Removing the scope-caching which happens on association proxies, because the ↵ | Jon Leighton | 2011-04-12 | 3 | -24/+15 |
| | | | | | | | | | | | | | | | | query is already cached by the query cacher. For formalised proof see http://www.youtube.com/watch?v=wDefXLb-FDs | ||||
* | | | | Update test name to the corresponding method name | Sebastian Martinez | 2011-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-12 | 10 | -26/+65 |
|\ \ \ \ | |||||
| * | | | | Update guides reflecting that scaffold_controller generator generates now ↵ | Sebastian Martinez | 2011-04-11 | 1 | -18/+19 |
| | | | | | | | | | | | | | | | | | | | | code for JSON response instead of XML | ||||
| * | | | | Updated AS guide with new Object#in? and Object#either? methods | Sebastian Martinez | 2011-04-11 | 1 | -0/+22 |
| | | | | | |||||
| * | | | | Revert "Edited railties/guides/source/active_support_core_extensions.textile ↵ | Xavier Noria | 2011-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via GitHub" Reason: The original sentence is correct. Please note the guide covers the stable version of Active Support. This reverts commit 5265650d51713a883e6cacde8f6faf52708abc1b. | ||||
| * | | | | Edited railties/guides/source/active_support_core_extensions.textile via GitHub | Oge Nnadi | 2011-04-11 | 1 | -1/+1 |
| | | | | |