aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8731 from amatsuda/readme_dir_treeGuillermo Iguaran2013-01-031-11/+15
|\ | | | | update directory tree in the generated README
| * update directory tree in the generated READMEAkira Matsuda2013-01-041-11/+15
| |
* | Merge pull request #8705 from amparo-luna/change_update_attributes_to_updateGuillermo Iguaran2013-01-034-6/+6
|\ \ | |/ |/| Rename update_attributes method to update
| * Updating default application templates to use update instead of ↵Amparo Luna + Guillermo Iguaran2013-01-034-6/+6
| | | | | | | | update_attributes
* | test PATCH method for update action in generated scaffold controller test ↵Akira Matsuda2013-01-033-5/+5
| | | | | | | | rather than PUT
* | Restore original remote_ip algorithm.Andre Arko2013-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | Proxy servers add X-Forwarded-For headers, resulting in a list of IPs. We remove trusted IP values, and then take the last given value, assuming that it is the most likely to be the correct, unfaked value. See [1] for a very thorough discussion of why that is the best option we have at the moment. [1]: http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection/ Fixes #7979
* | replace #flatten with Array()Gosha Arinich2013-01-021-2/+2
|/
* Add missing changelog entry for #8676 [ci skip]Jiri Pospisil2013-01-021-0/+4
|
* fix alignment in rails info properties page [ci skip]Vijay Dev2013-01-011-0/+2
|
* Add -B alias for --skip-bundleJiri Pospisil2013-01-011-1/+1
|
* Updated copyright notices for 2013Andrew Nesbitt2012-12-311-1/+1
|
* Merge pull request #8666 from mekishizufu/fix_lambdasSantiago Pastorino2012-12-312-2/+2
|\ | | | | Fix usage of lambda as a Rack endpoint
| * Fix usage of lambda as a Rack endpointJiri Pospisil2012-12-312-2/+2
| | | | | | | | The response body needs to respond_to? :each.
* | Add active_support/testing/autorunRafael Mendonça França2012-12-315-5/+6
| | | | | | | | | | minitest/autorun load minitest/spec polluting the global namespace with the DSL that we don't want on Rails
* | Inherit from MiniTest::Unit::TestCase instead of MiniTest::SpecRafael Mendonça França2012-12-311-1/+1
|/
* Improve secret_token deprecation messageSantiago Pastorino2012-12-301-3/+4
|
* Revert "Install binstubs by default"Jeremy Kemper2012-12-282-4/+4
| | | | | | This reverts commit f34c27a452418d8aa17f92bb0fd7ae97b5f7e252. We'll be taking a different tack on this with new `bundle binstubs <gem>` support.
* Revert "Detect rbenv and update the shebang"Jeremy Kemper2012-12-283-18/+1
| | | | | This reverts commit 7173c4f931c9026bd3bc0b644d93dae744433f09. This reverts commit a562f9fa09967eba26dff1c3bc8aa85b6f0a72ff.
* Consistent punctuation for @jaroslawr :bowtie:Jeremy Kemper2012-12-271-1/+1
|
* Consistent use of single and double quotesRafael Mendonça França2012-12-261-10/+10
|
* Merge pull request #8616 from senny/8612_respect_yaml_keywordsRafael Mendonça França2012-12-264-7/+48
|\ | | | | quote column names in generated fixture files
| * quote column names in generated fixture filesYves Senn2012-12-264-7/+48
| |
* | Revert "Ignore /bin on new apps" -- given the move to default binstubs, we ↵David Heinemeier Hansson2012-12-261-4/+3
|/ | | | | | want you to check those in! This reverts commit 35c554f0bf518e1068e79002a462c3deba649e9b.
* Explicit options should have precedence over railsrc on the `rails new`Rafael Mendonça França2012-12-242-2/+5
| | | | | | command Closes #8545
* remove duplication from Rails::Application docsHrvoje Šimić2012-12-241-2/+0
|
* Merge pull request #8588 from marcandre/fix_reversibleCarlos Antonio da Silva2012-12-231-2/+2
|\ | | | | Fix Migration#reversible by not using `transaction`.
| * Fixes for PR [#8267]Marc-Andre Lafortune2012-12-221-2/+2
| | | | | | | | | | | | | | | | * Fix Migration#reversible by not using `transaction`. * Adapt mysql adapter to updated api for remove_column * Update test after aedcd683684d08eaf30623a4b48ce31a31426372
* | Fix spacing regression in scaffold generatorYehuda Katz2012-12-221-1/+3
| |
* | Fix syntax error in controller templateGuillermo Iguaran2012-12-221-4/+12
| |
* | Ignore /bin on new appsJosé Valim2012-12-221-3/+4
| |
* | Forgot to check in railties fixture for binstubsYehuda Katz2012-12-221-0/+0
| |
* | Add --no-html to scaffold generatorYehuda Katz2012-12-225-8/+54
| |
* | Detect rbenv and update the shebangYehuda Katz2012-12-222-1/+18
| |
* | Install binstubs by defaultYehuda Katz2012-12-222-4/+4
|/
* Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵Jeremy Kemper2012-12-219-221/+2
| | | | with Rails 4.0.
* Correctly shows RAILS_ENV=development even when ENV['RAILS_ENV'] is not set ↵Andy Lindeman2012-12-211-0/+12
| | | | | | (e.g., in Pow) * Fixes #8025
* Revert "Make sure that RAILS_ENV is set when accessing Rails.env"Andy Lindeman2012-12-212-6/+1
| | | | | | | | This reverts commit b3125c89f42968bec6ee0b92ab93e36dbc36d5c3. * It is not desirable to set `ENV['RAILS_ENV']`; otherwise, it will leak through to rake tasks such as `rake test` or `rake spec`. See #7175 for more details.
* Update Migration and 4.0 Release Guides, Changelogs [#8267]Marc-Andre Lafortune2012-12-211-0/+4
|
* Migration generators use `change` even for destructive methods [#8267]Marc-Andre Lafortune2012-12-211-31/+12
|
* Simple replacement of variable name for consistencyMarc-Andre Lafortune2012-12-211-32/+32
|
* Integrate Journey into Action DispatchAndrew White2012-12-191-2/+0
| | | | | | | | Move the Journey code underneath the ActionDispatch namespace so that we don't pollute the global namespace with names that may be used for models. Fixes rails/journey#49.
* Revert "Add test to deprecation of Path#children"Carlos Antonio da Silva2012-12-191-6/+0
| | | | | | | | | | This reverts commit 29b1dc273e1ad6b9e13bf48fe3f12047850f9554. Conflicts: railties/test/application/paths_test.rb Reason: since 7f96e4317e1354852e9600becb16662de3c17691 was reverted, Path#children is no longer deprecated.
* update concerned testsFrancesco Rodriguez2012-12-181-0/+2
|
* fix railties CHANGELOG [ci skip]Francesco Rodriguez2012-12-181-2/+3
|
* Revert "Merge pull request #7587 from elia/fix-too-eager-loading"Rafael Mendonça França2012-12-183-17/+6
| | | | | | | | | | This reverts commit 3663057518eb9acf9b1e72f47dcb07038e6b7368. REASON: This caused a regression that add app folder in the eager load path. See #8146 for more information. Conflicts: railties/CHANGELOG.md
* Fix changelogDavid Heinemeier Hansson2012-12-181-3/+1
|
* MergeDavid Heinemeier Hansson2012-12-184-4/+13
|\
| * Format routes as html on debug pageschneems2012-12-172-74/+5
| | | | | | | | | | | | | | | | | | When someone gets a routing exception, the routes are rendered (starting in Rails 4.0). This PR brings parity between the html routes in the `rails/info/routes` path and when rendered from an exception. This is the continuation of #8521 which brought html formatted routes. In addition to bringing parity to the two views, we're keeping our views DRY by rendering off of the same partials. In this case Railties depends on partials provided by ActionDispatch. I'm open to alternative implementations. Ideally both views will use the same code so any improvements or updates to it will be reproduced on both. <hr /> ![](http://f.cl.ly/items/3O1D0K1v0j0i343O3T3T/Screen%20Shot%202012-12-17%20at%203.07.20%20PM.png)
| * HTML formatting to Rails::InfoController#routesschneems2012-12-174-4/+80
| | | | | | | | | | | | | | | | | | | | This PR adds formatting and meta-data to the display of the internal routes. Users can now toggle between showing helpers with the `_path` or _`url` suffix. There are multiple ways to achieve this, this method uses partials for formatting and meta-data. The partials can be re-used when rendering `routing_error.erb`, though that will need to be in a separate PR. ![](http://f.cl.ly/items/3A2p3c1T1t2f2X2R2K2S/Screen%20Shot%202012-12-12%20at%202.28.01%20PM.png) ATP Railties
* | Add app/models/concerns and app/controllers/concerns to the default ↵David Heinemeier Hansson2012-12-183-0/+17
|/ | | | directory structure and load path