Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Redirect using action hash instead of hardcoding full route | Carlos Antonio da Silva | 2013-01-05 | 1 | -1/+1 |
| | |||||
* | Change Rails Info controller to use the new table routes formatter | Carlos Antonio da Silva | 2013-01-05 | 2 | -5/+2 |
| | |||||
* | split formatting concerns from RoutesInspector | Yves Senn | 2013-01-05 | 1 | -2/+2 |
| | |||||
* | Merge pull request #8737 from tricknotes/info-page-style | Carlos Antonio da Silva | 2013-01-05 | 2 | -3/+4 |
|\ | | | | | Fix info page style [ci skip] | ||||
| * | Don't use layout when requested from xhr | Ryunosuke SATO | 2013-01-05 | 2 | -3/+4 |
| | | |||||
* | | Merge pull request #8765 from mmb/join_table_usage | Carlos Antonio da Silva | 2013-01-05 | 1 | -0/+13 |
|\ \ | | | | | | | Add join table migration generator to usage help. [ci skip] | ||||
| * | | Add join table migration generator to usage help. | Matthew M. Boedicker | 2013-01-04 | 1 | -0/+13 |
| |/ | |||||
* / | Don't use Rails.root since it is not available at this point | Rafael Mendonça França | 2013-01-05 | 2 | -2/+2 |
|/ | |||||
* | Remove unnecessary begin..rescue..end, use only rescue | Carlos Antonio da Silva | 2013-01-04 | 1 | -7/+5 |
| | |||||
* | Move class method to instance in dbconsole | Carlos Antonio da Silva | 2013-01-04 | 2 | -2/+3 |
| | | | | | This method doesn't need to be in the class, since it's only used only from the instance. | ||||
* | Merge pull request #8633 from mykola-kyryk/issue_8628 | Rafael Mendonça França | 2013-01-04 | 2 | -2/+19 |
|\ | | | | | | | | | | | Allow environment name to start with a substring of the default environment names. Fixes #8628 | ||||
| * | This commit fixes issue #8628 | Mykola Kyryk | 2013-01-04 | 2 | -2/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | Allow environment name to start with a substring of the default environment names. For example: tes, pro, prod, dev, devel, etc. Fixing identation. Adding test for Rails::Console.parse_arguments method. Fix issue 8628 for Rails::DBConsole. | ||||
* | | misleading error message that prompts non-existing command | Akira Matsuda | 2013-01-05 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
* | | get rid of unused .empty_directory files in the app generator | Akira Matsuda | 2013-01-05 | 7 | -0/+0 |
| | | |||||
* | | removed dangling whitespace in generated database yml | Aditya Sanghi | 2013-01-04 | 2 | -4/+4 |
|/ | |||||
* | Remove the fallback onto `ActiveXObject("Microsoft.XMLHTTP")`. | Franck Verrot | 2013-01-04 | 1 | -6/+2 |
| | |||||
* | Merge pull request #8738 from amatsuda/frozen_rails | Guillermo Iguaran | 2013-01-03 | 1 | -2/+2 |
|\ | | | | | another tiny update on generated README | ||||
| * | No such feature in Rails anymore. That's Bundler's business | Akira Matsuda | 2013-01-04 | 1 | -2/+2 |
| | | | | | | | | [ci skip] | ||||
* | | Apply `var` keyword to js at welcome#index | Ryunosuke SATO | 2013-01-04 | 1 | -1/+2 |
|/ | |||||
* | no, call <%= yield %> | Akira Matsuda | 2013-01-04 | 1 | -1/+1 |
| | |||||
* | Merge pull request #8731 from amatsuda/readme_dir_tree | Guillermo Iguaran | 2013-01-03 | 1 | -11/+15 |
|\ | | | | | update directory tree in the generated README | ||||
| * | update directory tree in the generated README | Akira Matsuda | 2013-01-04 | 1 | -11/+15 |
| | | |||||
* | | Merge pull request #8705 from amparo-luna/change_update_attributes_to_update | Guillermo Iguaran | 2013-01-03 | 2 | -3/+3 |
|\ \ | |/ |/| | Rename update_attributes method to update | ||||
| * | Updating default application templates to use update instead of ↵ | Amparo Luna + Guillermo Iguaran | 2013-01-03 | 2 | -3/+3 |
| | | | | | | | | update_attributes | ||||
* | | test PATCH method for update action in generated scaffold controller test ↵ | Akira Matsuda | 2013-01-03 | 1 | -1/+1 |
| | | | | | | | | rather than PUT | ||||
* | | replace #flatten with Array() | Gosha Arinich | 2013-01-02 | 1 | -2/+2 |
|/ | |||||
* | fix alignment in rails info properties page [ci skip] | Vijay Dev | 2013-01-01 | 1 | -0/+2 |
| | |||||
* | Add -B alias for --skip-bundle | Jiri Pospisil | 2013-01-01 | 1 | -1/+1 |
| | |||||
* | Add active_support/testing/autorun | Rafael Mendonça França | 2012-12-31 | 2 | -2/+2 |
| | | | | | minitest/autorun load minitest/spec polluting the global namespace with the DSL that we don't want on Rails | ||||
* | Improve secret_token deprecation message | Santiago Pastorino | 2012-12-30 | 1 | -3/+4 |
| | |||||
* | Revert "Install binstubs by default" | Jeremy Kemper | 2012-12-28 | 1 | -1/+1 |
| | | | | | | 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 Kemper | 2012-12-28 | 1 | -8/+1 |
| | | | | | This reverts commit 7173c4f931c9026bd3bc0b644d93dae744433f09. This reverts commit a562f9fa09967eba26dff1c3bc8aa85b6f0a72ff. | ||||
* | Consistent punctuation for @jaroslawr :bowtie: | Jeremy Kemper | 2012-12-27 | 1 | -1/+1 |
| | |||||
* | Merge pull request #8616 from senny/8612_respect_yaml_keywords | Rafael Mendonça França | 2012-12-26 | 2 | -4/+16 |
|\ | | | | | quote column names in generated fixture files | ||||
| * | quote column names in generated fixture files | Yves Senn | 2012-12-26 | 2 | -4/+16 |
| | | |||||
* | | Revert "Ignore /bin on new apps" -- given the move to default binstubs, we ↵ | David Heinemeier Hansson | 2012-12-26 | 1 | -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ça | 2012-12-24 | 1 | -2/+1 |
| | | | | | | command Closes #8545 | ||||
* | remove duplication from Rails::Application docs | Hrvoje Šimić | 2012-12-24 | 1 | -2/+0 |
| | |||||
* | Fix spacing regression in scaffold generator | Yehuda Katz | 2012-12-22 | 1 | -1/+3 |
| | |||||
* | Fix syntax error in controller template | Guillermo Iguaran | 2012-12-22 | 1 | -4/+12 |
| | |||||
* | Ignore /bin on new apps | José Valim | 2012-12-22 | 1 | -3/+4 |
| | |||||
* | Add --no-html to scaffold generator | Yehuda Katz | 2012-12-22 | 3 | -8/+37 |
| | |||||
* | Detect rbenv and update the shebang | Yehuda Katz | 2012-12-22 | 1 | -1/+8 |
| | |||||
* | Install binstubs by default | Yehuda Katz | 2012-12-22 | 1 | -1/+1 |
| | |||||
* | Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵ | Jeremy Kemper | 2012-12-21 | 5 | -28/+2 |
| | | | | with Rails 4.0. | ||||
* | Integrate Journey into Action Dispatch | Andrew White | 2012-12-19 | 1 | -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 "Merge pull request #7587 from elia/fix-too-eager-loading" | Rafael Mendonça França | 2012-12-18 | 1 | -12/+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 | ||||
* | Merge | David Heinemeier Hansson | 2012-12-18 | 2 | -3/+6 |
|\ | |||||
| * | Format routes as html on debug page | schneems | 2012-12-17 | 2 | -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#routes | schneems | 2012-12-17 | 2 | -3/+75 |
| | | | | | | | | | | | | | | | | | | | | 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 |