Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove `#among?` from Active Support | Prem Sichanugrist | 2011-04-13 | 2 | -2/+2 |
| | | | | | | 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 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 |
| | |||||
* | Change Object#either? to Object#among? -- thanks to @jamesarosen for the ↵ | David Heinemeier Hansson | 2011-04-12 | 2 | -2/+2 |
| | | | | 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) | ||||
* | Using Object#in? and Object#either? in various places | Prem Sichanugrist | 2011-04-11 | 2 | -2/+4 |
| | | | | 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 | 1 | -3/+7 |
| | | | | require turn if it is available | ||||
* | 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 | 2 | -12/+8 |
| | | | | | | | | 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`. | ||||
* | 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> | ||||
* | silence @dummy_path not defined warnings | Jack Dempsey | 2011-03-14 | 1 | -0/+1 |
| | |||||
* | Add require 'date' to use Date.today in plugin template MIT-LICENSE | Samuel Kadolph | 2011-03-12 | 1 | -0/+1 |
| | |||||
* | revises links to the API websites of individual components (no longer ↵ | Xavier Noria | 2011-03-09 | 1 | -1/+1 |
| | | | | maintained), and rewrites the section about after and around filters in the controller guide | ||||
* | The root route example was the only using double quotes; switched it to ↵ | Chris Kalafarski | 2011-03-08 | 1 | -1/+1 |
| | | | | single quotes for consistency | ||||
* | more "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 1 | -1/+1 |
| | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | ||||
* | Railties typos. | R.T. Lechow | 2011-03-05 | 2 | -2/+2 |
| | |||||
* | log and readme should respect --quiet | José Valim | 2011-03-04 | 1 | -3/+4 |
| | |||||
* | revises a few details in public/index.html | Xavier Noria | 2011-02-28 | 1 | -7/+9 |
| | |||||
* | Make sure the Thor generator LoadError does not output --dev twice [#6431 ↵ | Jeff Kreeftmeijer | 2011-02-27 | 1 | -1/+1 |
| | | | | | | state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | |||||
* | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | ||||
| * | Fixed issue #6363, avoid to pluralized already pluralized names and ↵ | Timothy N. Tsvetkov | 2011-02-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | singularize a single in generators, for example stadia is a valid plural for stadium. But calling pluralize for stadia will return stadias which sematically is not corrent in this case [#6363 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 12 | -1038/+2075 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb | ||||
| * | added proper require for ruby-debug19 gem to generated Gemfile | Wojciech Wnętrzak | 2011-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | [#6419 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Make rails.js include the CSRF token in the X-CSRF-Token header with every ↵ | Michael Koziarski | 2011-02-08 | 1 | -0/+16 |
| | | | | | | | | ajax request. | ||||
| * | Update jQuery UJS | Santiago Pastorino | 2011-02-05 | 1 | -149/+143 |
| | | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-02 | 1 | -1/+1 |
| |\ | |||||
| | * | corrected a mistake in the documentation for assert_migration | misfo | 2011-01-29 | 1 | -1/+1 |
| | | | |||||
| * | | Update to jQuery 1.5 | Santiago Pastorino | 2011-02-01 | 1 | -852/+1849 |
| | | | | | | | | | | | | | | | Check out http://blog.jquery.com/2011/01/31/jquery-15-released/ for more information. | ||||
| * | | updating Gemfile with more contemporary example | geemus | 2011-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | Merge branch 'fix-gitignore' of https://github.com/telemachus/rails into ↵ | Mikel Lindsaar | 2011-01-30 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | | | | telemachus-fix-gitignore | ||||
| | * | Minor fix to gitignore syntax | Peter Aronoff | 2011-01-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-01-20 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | fixes rubycentral url and a minor AR change | Vijay Dev | 2011-01-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | change sqlite3-ruby => sqlite3 in the generators | Aaron Patterson | 2011-01-16 | 3 | -15/+3 |
| | | | | |||||
| * | | | README.rdoc is a template | Santiago Pastorino | 2011-01-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | plugin new generator should generate config/routes.rb file for full engines | Santiago Pastorino | 2011-01-14 | 2 | -2/+5 |
| | |/ | |/| | |||||
| * | | fixes a comment in the generated app Gemfile | Xavier Noria | 2011-01-12 | 1 | -1/+1 |
| | | | |||||
| * | | adds a sample gem call for RedCloth in the generated app Gemfile | Xavier Noria | 2011-01-12 | 1 | -0/+3 |
| | | | |||||
| * | | Make sure that generator's default banner is showing its namespace | Prem Sichanugrist | 2011-01-01 | 1 | -1/+1 |
| |/ | | | | | | | This will make `rails g rspec:install --help` shows "rails generate rspec:install [options]" and not "rails generate install [options]" | ||||
| * | Update JQuery UJS | Santiago Pastorino | 2010-12-26 | 1 | -26/+48 |
| | | |||||
| * | Update Prototype UJS | Santiago Pastorino | 2010-12-26 | 1 | -29/+43 |
| | | |||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2010-12-20 | 16 | -367/+482 |
|\| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb | ||||
| * | Do not load all application's task in generated engine | Piotr Sarnacki | 2010-12-19 | 1 | -6/+3 |
| | | |||||
| * | Use require 'bundler/setup' instead of directly calling Bundler.setup in ↵ | Piotr Sarnacki | 2010-12-17 | 1 | -10/+3 |
| | | | | | | | | config/boot.rb |