Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Make sure assets is disable when --skip-sprockets is used | Rafael Mendonça França | 2013-01-05 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | config.assets.enabled is now true by default | David Heinemeier Hansson | 2013-01-05 | 5 | -9/+14 | |
|/ / / | ||||||
* | | | Merge pull request #8768 from goshakkk/about-env-toggling | Guillermo Iguaran | 2013-01-05 | 1 | -7/+11 | |
|\ \ \ | | | | | | | | | Allow toggling "about app's env", not just showing | |||||
| * | | | allow toggling about env, not just showing | Gosha Arinich | 2013-01-05 | 1 | -7/+11 | |
|/ / / | ||||||
* / / | Remove warning, remove not used variable, and make methods private | Carlos Antonio da Silva | 2013-01-05 | 1 | -3/+5 | |
|/ / | | | | | | | Warning: "shadowing outer local variable - routes". | |||||
* | | Close container div tag in routing error page | Carlos Antonio da Silva | 2013-01-05 | 1 | -9/+11 | |
| | | ||||||
* | | Move style to head to make routes page valid html5 | Carlos Antonio da Silva | 2013-01-05 | 3 | -4/+8 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | Action Pack changelog improvements [ci skip] | Carlos Antonio da Silva | 2013-01-05 | 1 | -32/+35 | |
| | | ||||||
* | | Merge pull request #8658 from senny/8649_unify_routes_output_for_console_and_web | Carlos Antonio da Silva | 2013-01-05 | 7 | -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 Senn | 2013-01-05 | 4 | -11/+46 | |
| | | | ||||||
| * | | split formatting concerns from RoutesInspector | Yves Senn | 2013-01-05 | 3 | -26/+65 | |
|/ / | ||||||
* | | 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 | |
| |/ / | ||||||
* | | | Remove warning "ambiguous first argument" | Carlos Antonio da Silva | 2013-01-05 | 1 | -1/+1 | |
| | | | ||||||
* | | | Use better variable names for ltree tests, remove instance variable | Carlos Antonio da Silva | 2013-01-05 | 2 | -14/+12 | |
| | | | ||||||
* | | | Rename the last occurrence of UnexpectedParameters | Rafael Mendonça França | 2013-01-05 | 1 | -2/+2 | |
| | | | ||||||
* | | | Wrong copy and paste :bomb: | Rafael Mendonça França | 2013-01-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | Add documentation to raise_on_unpermitted_parameters option | Rafael Mendonça França | 2013-01-05 | 1 | -2/+17 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | Rename the configuration to raise_on_unpermitted_parameters | Rafael Mendonça França | 2013-01-05 | 4 | -24/+26 | |
| | | | | | | | | | | | | Also changed the exception to UnpermittedParameters | |||||
* | | | Ensure that raise_on_unexpected_params configuration will work | Rafael Mendonça França | 2013-01-05 | 2 | -9/+55 | |
| | | | ||||||
* | | | Merge pull request #8752 from thomasfedb/master | Rafael Mendonça França | 2013-01-05 | 3 | -6/+64 | |
|\ \ \ | | | | | | | | | Exception on unexpected params when enabled. | |||||
| * | | | Allow developers to enable raising of exception when unexpected params are ↵ | Thomas Drake-Brockman | 2013-01-05 | 3 | -6/+64 | |
| | | | | | | | | | | | | | | | | provided. | |||||
* | | | | Revert "[#8743] Test case" | Rafael Mendonça França | 2013-01-05 | 1 | -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 point | Rafael Mendonça França | 2013-01-05 | 2 | -2/+2 | |
| | | | | ||||||
* | | | | [#8743] Test case | Cédric FABIANSKI | 2013-01-05 | 1 | -0/+5 | |
| |/ / |/| | | | | | | | | | | | | | | | | | - Reverting #a3cf03ef99 fixes the issue Conflicts: activerecord/test/cases/relations_test.rb | |||||
* | | | 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. | |||||
* | | | Move changelog entry in railties to the top | Carlos Antonio da Silva | 2013-01-04 | 3 | -13/+12 | |
| | | | | | | | | | | | | Other minor changelog improvements [ci skip] | |||||
* | | | Merge pull request #8762 from hsbt/fix-marshal_load | Aaron Patterson | 2013-01-04 | 1 | -2/+10 | |
|\ \ \ | | | | | | | | | added marshal_load and marshal_dump for ProxyTestResult. Behavior of met... | |||||
| * | | | added marshal_load and marshal_dump for ProxyTestResult. Behavior of ↵ | SHIBATA Hiroshi | 2013-01-05 | 1 | -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-3 | Guillermo Iguaran | 2013-01-04 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Small typo fix in railties/CHANGELOG.md | |||||
| * | | | Small typo fix in railties/CHANGELOG.md | Matt Bridges | 2013-01-04 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #8633 from mykola-kyryk/issue_8628 | Rafael Mendonça França | 2013-01-04 | 5 | -2/+44 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -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_fix | Rafael Mendonça França | 2013-01-04 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | fix failing test broken in 15fb7889c5566ddade1d8f74f49bbbc1c0be6057 | |||||
| * | | | fix failing test broken in 15fb7889c5566ddade1d8f74f49bbbc1c0be6057 | Akira Matsuda | 2013-01-05 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #8722 from kwstannard/string_to_date_change | Andrew White | 2013-01-04 | 3 | -5/+10 | |
|\ \ \ \ | | | | | | | | | | | Better error message for String#to_date | |||||
| * | | | | Better error message for String#to_date | Kelly Stannard | 2013-01-04 | 3 | -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-type | Rafael Mendonça França | 2013-01-04 | 7 | -3/+77 | |
|\ \ \ \ | |/ / / |/| | | | Support for PostgreSQL's ltree datatype | |||||
| * | | | Support for PostgreSQL's ltree data type. | Rob Worley | 2013-01-04 | 7 | -3/+77 | |
|/ / / | ||||||
* | | | Merge pull request #8758 from amatsuda/plugin_new_error_message | Carlos Antonio da Silva | 2013-01-04 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Misleading error message that prompts non-existing command [ci skip] | |||||
| * | | | misleading error message that prompts non-existing command | Akira Matsuda | 2013-01-05 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | [ci skip] | |||||
* | | | Merge pull request #8754 from amatsuda/app_generator_unused_empty_directories | Guillermo Iguaran | 2013-01-04 | 7 | -0/+0 | |
|\ \ \ | | | | | | | | | get rid of unused .empty_directory files in the app generator | |||||
| * | | | get rid of unused .empty_directory files in the app generator | Akira Matsuda | 2013-01-05 | 7 | -0/+0 | |
|/ / / | ||||||
* | | | Allow use of durations for ActionDispatch::SSL configuration | Andrew White | 2013-01-04 | 2 | -1/+8 | |
| | | | ||||||
* | | | Merge pull request #8750 from tricknotes/remove-unnecessary-h | Carlos Antonio da Silva | 2013-01-04 | 7 | -17/+17 | |
|\ \ \ | | | | | | | | | Remove unnecessary `ERB::Util::h` |