Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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] | ||||
* | | 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' 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> | ||||
* | 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 |
| | |||||
* | Filter sensitive query string parameters in the log [#6244 state:committed] | Prem Sichanugrist & Xavier Noria | 2011-03-11 | 1 | -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 Noria | 2011-03-09 | 1 | -1/+1 |
| | | | | maintained), and rewrites the section about after and around filters in the controller guide | ||||
* | refactored Engine.#find by giving an explicit name to a variable and ↵ | Diego Carrion | 2011-03-09 | 1 | -3/+3 |
| | | | | | | | | reducing calls [#6529 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | 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 | 4 | -6/+6 |
| | |||||
* | log and readme should respect --quiet | José Valim | 2011-03-04 | 1 | -3/+4 |
| | |||||
* | only compute path.to_s once | Aaron Patterson | 2011-03-02 | 1 | -1/+4 |
| | |||||
* | reduce two method calls per request, 1 to method_missing and one to send | Aaron Patterson | 2011-02-28 | 1 | -0/+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> | ||||
* | Always use ActionDispatch::ShowExceptions middleware [#6462 state:resolved] | Prem Sichanugrist | 2011-02-25 | 1 | -1/+1 |
| | | | | This will make sure the application will raise `ActionController::RoutingError` in case "X-Cascade: pass" header was set, usually when there's no route match. | ||||
* | Make sure that we set `env["action_dispatch.show_exceptions"]` | Prem Sichanugrist | 2011-02-25 | 1 | -1/+2 |
| | | | | This has been used by `show_exception` middleware even the setting wasn't get passed to `env` hash. | ||||
* | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | |||||
* | improve language and examples in Railtie docs | Jimmy Cuadra | 2011-02-18 | 1 | -33/+21 |
| | |||||
* | 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 | 23 | -1155/+2221 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | Application's assets should have higher priority than engine's ones | Piotr Sarnacki | 2011-02-09 | 1 | -1/+4 |
| | | | | | | | | [#6388 state:resolved] | ||||
| * | 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 |
| | | |||||
| * | Drop remaining script/plugin sources references | Tim Pope | 2011-02-03 | 1 | -6/+1 |
| | | | | | | | | | | | | [#3742 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | 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. | ||||
| * | | Accept 'postgres' as a PostgreSQL driver name in dbconsole for non-AR ORMs ↵ | Akira Matsuda | 2011-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | like DataMapper and Sequel [#6180 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | updating Gemfile with more contemporary example | geemus | 2011-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> |