Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Blah, assets cant be turned on from initializers either | David Heinemeier Hansson | 2011-04-13 | 2 | -3/+3 | |
| | ||||||
* | Cleanup comments | David Heinemeier Hansson | 2011-04-13 | 1 | -3/+1 | |
| | ||||||
* | Not needed | David Heinemeier Hansson | 2011-04-13 | 1 | -1/+0 | |
| | ||||||
* | Require asset pipeline targets by default | David Heinemeier Hansson | 2011-04-13 | 1 | -2/+2 | |
| | ||||||
* | Require everything by default | David Heinemeier Hansson | 2011-04-13 | 1 | -1/+4 | |
| | ||||||
* | Dont need to make application.js into coffee since it will mostly be a ↵ | David Heinemeier Hansson | 2011-04-13 | 1 | -1/+1 | |
| | | | | manifest file anyway | |||||
* | Move json requirement to user Gemfile -- still need to do better than this, ↵ | David Heinemeier Hansson | 2011-04-13 | 2 | -4/+2 | |
| | | | | though | |||||
* | Use Sass from git until the final gem is out | David Heinemeier Hansson | 2011-04-13 | 1 | -1/+1 | |
| | ||||||
* | Move the asset template engines to the user-generated Gemfile | David Heinemeier Hansson | 2011-04-13 | 3 | -3/+5 | |
| | ||||||
* | Generate CoffeeScript stub by default | Joshua Peek | 2011-04-13 | 2 | -6/+6 | |
| | ||||||
* | Include CoffeeScript in Gemfile | Joshua Peek | 2011-04-13 | 1 | -2/+4 | |
| | ||||||
* | Add default require directives for jquery | Joshua Peek | 2011-04-13 | 1 | -0/+4 | |
| | ||||||
* | Blah, identity_map has to be setup in application.rb to work | David Heinemeier Hansson | 2011-04-13 | 3 | -13/+11 | |
| | ||||||
* | Fix triplets | David Heinemeier Hansson | 2011-04-13 | 1 | -397/+1 | |
| | ||||||
* | Clean up the generator, switch to assets usage, use vendor/assets for the ↵ | David Heinemeier Hansson | 2011-04-13 | 14 | -46/+445 | |
| | | | | default scripts, and more | |||||
* | Move to app/assets in anticipation of image support being added as well. ↵ | David Heinemeier Hansson | 2011-04-13 | 1 | -2/+4 | |
| | | | | Also add vendor/assets to default load path | |||||
* | Until the latest sprockets gem is released, we need new apps to reference it ↵ | David Heinemeier Hansson | 2011-04-13 | 1 | -9/+12 | |
| | | | | directly | |||||
* | Remove `#among?` from Active Support | Prem Sichanugrist | 2011-04-13 | 7 | -7/+7 | |
| | | | | | | After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now. It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`. | |||||
* | removes some remaining .rjs occurrences | Xavier Noria | 2011-04-13 | 1 | -3/+3 | |
| | ||||||
* | removes debug_rjs from ActionView::Base | Xavier Noria | 2011-04-13 | 1 | -1/+0 | |
| | ||||||
* | jQuery is the new default | Xavier Noria | 2011-04-13 | 2 | -7/+7 | |
| | ||||||
* | 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 | 19 | -41/+99 | |
|\ | ||||||
| * | Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵ | David Heinemeier Hansson | 2011-04-12 | 7 | -7/+7 | |
| | | | | | | | | suggestion! | |||||
| * | Keep the same API semantics for update/delete as we had for XML (just return ↵ | David Heinemeier Hansson | 2011-04-11 | 1 | -2/+2 | |
| | | | | | | | | 200 OK, no body) | |||||
| * | Cant use inclusion in commands/application.rb as the frameworks havent all ↵ | David Heinemeier Hansson | 2011-04-11 | 1 | -2/+1 | |
| | | | | | | | | been required yet | |||||
| * | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 8 | -8/+22 | |
| | | | | | | | | There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?. | |||||
| * | Add --old-style-hash option to force creating old style hash on Ruby 1.9 | Prem Sichanugrist | 2011-04-10 | 2 | -2/+8 | |
| | | | | | | | | That means if you don't like the new syntax, you can pass --old-style-hash to force Rails to generate code with hash rockets. | |||||
| * | Rails will now generate Ruby 1.9 style hash when running app generator on ↵ | Prem Sichanugrist | 2011-04-10 | 3 | -3/+12 | |
| | | | | | | | | | | | | Ruby 1.9.x The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate. | |||||
| * | Rails will now generate Ruby 1.9 style hash when running scaffold_controller ↵ | Prem Sichanugrist | 2011-04-10 | 4 | -19/+29 | |
| | | | | | | | | | | | | | | | | generator on Ruby 1.9.x The new hash syntax of Ruby 1.9 looks more superior, so we decide to switch to it in the places that appropriate. This patch has been requested by DHH. | |||||
| * | Make scaffold_controller generator generate code for JSON response instead ↵ | Prem Sichanugrist | 2011-04-10 | 1 | -14/+14 | |
| | | | | | | | | | | | | | | | | of XML It seems like a lot of people are using JSON in their API more than XML nowadays, so Rails should follow that convention by providing the JSON format block in scaffold_controller by default. This patch has been requested by DHH | |||||
| * | make turn a soft dependency. generate a Gemfile that contains turn and ↵ | Aaron Patterson | 2011-04-08 | 2 | -6/+14 | |
| | | | | | | | | require turn if it is available | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-03 | 1 | -2/+2 | |
| |\ | ||||||
| | * | s/ERb/ERB/g | Akira Matsuda | 2011-04-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html | |||||
| * | | Moved Turn activation/dependency to railties | David Heinemeier Hansson | 2011-03-31 | 2 | -1/+9 | |
| | | | ||||||
| * | | Direct logging of Active Record to STDOUT so it's shown inline with the ↵ | David Heinemeier Hansson | 2011-03-31 | 1 | -0/+4 | |
| | | | | | | | | | | | | results in the console [DHH] | |||||
* | | | 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 | 3 | -17/+24 | |
| | | | ||||||
* | | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 6 | -34/+49 | |
|\| | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb | |||||
| * | | Engines that use isolate_namespace with nested modules should set correct ↵ | Rolf Timmermans | 2011-03-28 | 1 | -2/+2 | |
| | | | | | | | | | | | | module prefix for their routes. | |||||
| * | | let these heredocs flow with the code | Xavier Noria | 2011-03-28 | 1 | -14/+15 | |
| | | | ||||||
| * | | Make edge and dev options use edge mysql2 | Santiago Pastorino | 2011-03-27 | 1 | -6/+14 | |
| |/ | ||||||
| * | Add `config.force_ssl` configuration which will load `Rack::SSL` middleware ↵ | Prem Sichanugrist | 2011-03-27 | 4 | -17/+23 | |
| | | | | | | | | | | | | | | | | if set to true This will allow user to be able to force all requests to be under HTTPS protocol. This commit was a request from DHH. Special thanks to Josh Peek as well for making `Rack::SSL`. | |||||
* | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 2 | -1/+9 | |
|\| | ||||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-23 | 1 | -0/+8 | |
| |\ | ||||||
| | * | Beef up Rails::Railtie::Configuration docs | Gabriel Horner | 2011-03-19 | 1 | -0/+8 | |
| | | | ||||||
| * | | Fix test for prepend giving a false positive. [#5716 state:resolved] | Aditya Sanghi | 2011-03-23 | 1 | -1/+1 | |
| |/ | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Precompile configured assets | Joshua Peek | 2011-03-29 | 2 | -3/+3 | |
| | |