aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Index sprockets environment if perform caching is enabledJoshua Peek2011-04-122-0/+7
|
* Merge branch 'master' into sprocketsJoshua Peek2011-04-1219-41/+99
|\
| * Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵David Heinemeier Hansson2011-04-127-7/+7
| | | | | | | | suggestion!
| * Keep the same API semantics for update/delete as we had for XML (just return ↵David Heinemeier Hansson2011-04-111-2/+2
| | | | | | | | 200 OK, no body)
| * Cant use inclusion in commands/application.rb as the frameworks havent all ↵David Heinemeier Hansson2011-04-111-2/+1
| | | | | | | | been required yet
| * Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-118-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.9Prem Sichanugrist2011-04-102-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 Sichanugrist2011-04-103-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 Sichanugrist2011-04-104-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 Sichanugrist2011-04-101-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 Patterson2011-04-082-6/+14
| | | | | | | | require turn if it is available
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-031-2/+2
| |\
| | * s/ERb/ERB/gAkira Matsuda2011-04-031-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 railtiesDavid Heinemeier Hansson2011-03-312-1/+9
| | |
| * | Direct logging of Active Record to STDOUT so it's shown inline with the ↵David Heinemeier Hansson2011-03-311-0/+4
| | | | | | | | | | | | results in the console [DHH]
* | | Fix assets prefix joiningJoshua Peek2011-03-301-1/+1
| | |
* | | Fix assets prefix joiningJoshua Peek2011-03-301-1/+1
| | |
* | | Fix config.assets.precompile optionJoshua Peek2011-03-301-1/+1
| | |
* | | Unify sprockets config optionsJoshua Peek2011-03-303-17/+24
| | |
* | | Merge branch 'master' into sprocketsJoshua Peek2011-03-306-34/+49
|\| | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb
| * | Engines that use isolate_namespace with nested modules should set correct ↵Rolf Timmermans2011-03-281-2/+2
| | | | | | | | | | | | module prefix for their routes.
| * | let these heredocs flow with the codeXavier Noria2011-03-281-14/+15
| | |
| * | Make edge and dev options use edge mysql2Santiago Pastorino2011-03-271-6/+14
| |/
| * Add `config.force_ssl` configuration which will load `Rack::SSL` middleware ↵Prem Sichanugrist2011-03-274-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 sprocketsJoshua Peek2011-03-302-1/+9
|\|
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-231-0/+8
| |\
| | * Beef up Rails::Railtie::Configuration docsGabriel Horner2011-03-191-0/+8
| | |
| * | Fix test for prepend giving a false positive. [#5716 state:resolved]Aditya Sanghi2011-03-231-1/+1
| |/ | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Precompile configured assetsJoshua Peek2011-03-292-3/+3
| |
* | Rename option to config.asset_pipelineJoshua Peek2011-03-294-18/+22
| |
* | Move sprockets initializers back to applicationJoshua Peek2011-03-295-51/+41
| |
* | Change back to /assets prefixJoshua Peek2011-03-291-11/+8
| |
* | Fix building route set with sprockets in productionJoshua Peek2011-03-291-2/+14
| |
* | Fix sprockets loggerJoshua Peek2011-03-291-1/+4
| |
* | Fix reference to config.use_sprocketsJoshua Peek2011-03-281-1/+1
| |
* | Add use_sprockets flagJoshua Peek2011-03-283-5/+8
| |
* | Logger isn't set hereJoshua Peek2011-03-281-1/+1
| |
* | Add route for assetsJoshua Peek2011-03-282-34/+35
| |
* | Change static root to /publicJoshua Peek2011-03-221-1/+1
| |
* | Use sprockets precompileJoshua Peek2011-03-221-10/+2
| |
* | Move app/javascripts and app/stylesheets under app/assetsJoshua Peek2011-03-221-6/+6
| |
* | Remove ensure_fresh_assets flagJoshua Peek2011-03-221-1/+0
| |
* | Assign sprockets static rootJoshua Peek2011-03-221-0/+1
| |
* | Need to load assets task fileJoshua Peek2011-03-211-0/+1
| |
* | Add sprockets task to compile assetsJoshua Peek2011-03-212-1/+17
| |
* | Add sprockets environment to ApplicationJoshua Peek2011-03-211-0/+34
|/
* silence @dummy_path not defined warningsJack Dempsey2011-03-141-0/+1
|
* Add require 'date' to use Date.today in plugin template MIT-LICENSESamuel Kadolph2011-03-121-0/+1
|
* Filter sensitive query string parameters in the log [#6244 state:committed]Prem Sichanugrist & Xavier Noria2011-03-111-1/+1
| | | | | | This provides more safety to applications that put secret information in the query string, such as API keys or SSO tokens. Signed-off-by: Xavier Noria <fxn@hashref.com>
* revises links to the API websites of individual components (no longer ↵Xavier Noria2011-03-091-1/+1
| | | | maintained), and rewrites the section about after and around filters in the controller guide