aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove warning, remove not used variable, and make methods privateCarlos Antonio da Silva2013-01-051-3/+5
| | | | Warning: "shadowing outer local variable - routes".
* Close container div tag in routing error pageCarlos Antonio da Silva2013-01-051-9/+11
|
* Move style to head to make routes page valid html5Carlos Antonio da Silva2013-01-053-4/+8
|
* Redirect using action hash instead of hardcoding full routeCarlos Antonio da Silva2013-01-051-1/+1
|
* Change Rails Info controller to use the new table routes formatterCarlos Antonio da Silva2013-01-052-5/+2
|
* Action Pack changelog improvements [ci skip]Carlos Antonio da Silva2013-01-051-32/+35
|
* Merge pull request #8658 from senny/8649_unify_routes_output_for_console_and_webCarlos Antonio da Silva2013-01-057-37/+111
|\ | | | | | | | | Unify routes output for console and web, ensure engine routes are shown in html routes table. Closes #8649.
| * display mountable engine routes on RoutingError.Yves Senn2013-01-054-11/+46
| |
| * split formatting concerns from RoutesInspectorYves Senn2013-01-053-26/+65
|/
* Merge pull request #8737 from tricknotes/info-page-styleCarlos Antonio da Silva2013-01-052-3/+4
|\ | | | | Fix info page style [ci skip]
| * Don't use layout when requested from xhrRyunosuke SATO2013-01-052-3/+4
| |
* | Merge pull request #8765 from mmb/join_table_usageCarlos Antonio da Silva2013-01-051-0/+13
|\ \ | | | | | | Add join table migration generator to usage help. [ci skip]
| * | Add join table migration generator to usage help.Matthew M. Boedicker2013-01-041-0/+13
| |/
* | Remove warning "ambiguous first argument"Carlos Antonio da Silva2013-01-051-1/+1
| |
* | Use better variable names for ltree tests, remove instance variableCarlos Antonio da Silva2013-01-052-14/+12
| |
* | Rename the last occurrence of UnexpectedParametersRafael Mendonça França2013-01-051-2/+2
| |
* | Wrong copy and paste :bomb:Rafael Mendonça França2013-01-051-1/+1
| | | | | | | | [ci skip]
* | Add documentation to raise_on_unpermitted_parameters optionRafael Mendonça França2013-01-051-2/+17
| | | | | | | | [ci skip]
* | Rename the configuration to raise_on_unpermitted_parametersRafael Mendonça França2013-01-054-24/+26
| | | | | | | | Also changed the exception to UnpermittedParameters
* | Ensure that raise_on_unexpected_params configuration will workRafael Mendonça França2013-01-052-9/+55
| |
* | Merge pull request #8752 from thomasfedb/masterRafael Mendonça França2013-01-053-6/+64
|\ \ | | | | | | Exception on unexpected params when enabled.
| * | Allow developers to enable raising of exception when unexpected params are ↵Thomas Drake-Brockman2013-01-053-6/+64
| | | | | | | | | | | | provided.
* | | Revert "[#8743] Test case"Rafael Mendonça França2013-01-051-5/+0
| | | | | | | | | | | | | | | | | | This reverts commit 162e2859813b31c50700b453aa61992dfa57139e. This commit was added by mistake, sorry :bow:
* | | Don't use Rails.root since it is not available at this pointRafael Mendonça França2013-01-052-2/+2
| | |
* | | [#8743] Test caseCédric FABIANSKI2013-01-051-0/+5
| |/ |/| | | | | | | | | | | - Reverting #a3cf03ef99 fixes the issue Conflicts: activerecord/test/cases/relations_test.rb
* | Remove unnecessary begin..rescue..end, use only rescueCarlos Antonio da Silva2013-01-041-7/+5
| |
* | Move class method to instance in dbconsoleCarlos Antonio da Silva2013-01-042-2/+3
| | | | | | | | | | This method doesn't need to be in the class, since it's only used only from the instance.
* | Move changelog entry in railties to the topCarlos Antonio da Silva2013-01-043-13/+12
| | | | | | | | Other minor changelog improvements [ci skip]
* | Merge pull request #8762 from hsbt/fix-marshal_loadAaron Patterson2013-01-041-2/+10
|\ \ | | | | | | added marshal_load and marshal_dump for ProxyTestResult. Behavior of met...
| * | added marshal_load and marshal_dump for ProxyTestResult. Behavior of ↵SHIBATA Hiroshi2013-01-051-2/+10
|/ / | | | | | | method_missing with Marshal.dump and Marshal.load is changing in ruby 2.0.0 later.
* | Merge pull request #8761 from mattdbridges/patch-3Guillermo Iguaran2013-01-041-1/+1
|\ \ | | | | | | Small typo fix in railties/CHANGELOG.md
| * | Small typo fix in railties/CHANGELOG.mdMatt Bridges2013-01-041-1/+1
|/ /
* | Merge pull request #8633 from mykola-kyryk/issue_8628Rafael Mendonça França2013-01-045-2/+44
|\ \ | | | | | | | | | | | | | | | Allow environment name to start with a substring of the default environment names. Fixes #8628
| * | This commit fixes issue #8628Mykola Kyryk2013-01-045-2/+44
| |/ | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #8760 from amatsuda/railties_failing_tests_fixRafael Mendonça França2013-01-041-1/+1
|\ \ | | | | | | fix failing test broken in 15fb7889c5566ddade1d8f74f49bbbc1c0be6057
| * | fix failing test broken in 15fb7889c5566ddade1d8f74f49bbbc1c0be6057Akira Matsuda2013-01-051-1/+1
| | |
* | | Merge pull request #8722 from kwstannard/string_to_date_changeAndrew White2013-01-043-5/+10
|\ \ \ | | | | | | | | Better error message for String#to_date
| * | | Better error message for String#to_dateKelly Stannard2013-01-043-5/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | I did this because to_date gives a very unhelpful error message if you do not pass in a correct date. In the process I think this cleans up the code nicely and even better it tends to be slightly faster than the current implementation. Benchmark https://gist.github.com/4440875
* | | Merge pull request #8755 from robworley/postgresql-ltree-data-typeRafael Mendonça França2013-01-047-3/+77
|\ \ \ | |/ / |/| | Support for PostgreSQL's ltree datatype
| * | Support for PostgreSQL's ltree data type.Rob Worley2013-01-047-3/+77
|/ /
* | Merge pull request #8758 from amatsuda/plugin_new_error_messageCarlos Antonio da Silva2013-01-041-1/+1
|\ \ | | | | | | Misleading error message that prompts non-existing command [ci skip]
| * | misleading error message that prompts non-existing commandAkira Matsuda2013-01-051-1/+1
|/ / | | | | | | [ci skip]
* | Merge pull request #8754 from amatsuda/app_generator_unused_empty_directoriesGuillermo Iguaran2013-01-047-0/+0
|\ \ | | | | | | get rid of unused .empty_directory files in the app generator
| * | get rid of unused .empty_directory files in the app generatorAkira Matsuda2013-01-057-0/+0
|/ /
* | Allow use of durations for ActionDispatch::SSL configurationAndrew White2013-01-042-1/+8
| |
* | Merge pull request #8750 from tricknotes/remove-unnecessary-hCarlos Antonio da Silva2013-01-047-17/+17
|\ \ | | | | | | Remove unnecessary `ERB::Util::h`
| * | Remove unnecessary `ERB::Util::h`Ryunosuke SATO2013-01-057-17/+17
| | | | | | | | | | | | It is automatically applied when strings is unsafe for html.
* | | Merge pull request #8747 from asanghi/wsfixCarlos Antonio da Silva2013-01-042-4/+4
|\ \ \ | | | | | | | | Remove dangling whitespace in generated database yml files for postgresql and sqlserver [ci skip]
| * | | removed dangling whitespace in generated database ymlAditya Sanghi2013-01-042-4/+4
| |/ /
* | | Merge pull request #8746 from tricknotes/remove-h-from-guidesCarlos Antonio da Silva2013-01-042-6/+6
|\ \ \ | |/ / |/| | ERB::Util::h is no longer generated in scaffold [ci skip]