aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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]
| * | ERB::Util::h is no longer generated in scaffoldRyunosuke SATO2013-01-052-6/+6
|/ /
* | Merge pull request #8744 from tricknotes/suppress-warningRafael Mendonça França2013-01-041-1/+1
|\ \ | |/ |/| Suppress warning about IO#lines in Ruby 2.0
| * Suppress warning about IO#lines in Ruby 2.0Ryunosuke SATO2013-01-041-1/+1
|/ | | | actionpack/lib/action_dispatch/middleware/exception_wrapper.rb:99: IO#lines is deprecated; use #each_line instead
* Merge pull request #8739 from franckverrot/remove_activexobjectGuillermo Iguaran2013-01-041-6/+2
|\ | | | | Remove the fallback onto `ActiveXObject("Microsoft.XMLHTTP")`.
| * Remove the fallback onto `ActiveXObject("Microsoft.XMLHTTP")`.Franck Verrot2013-01-041-6/+2
|/
* Merge pull request #8738 from amatsuda/frozen_railsGuillermo Iguaran2013-01-031-2/+2
|\ | | | | another tiny update on generated README
| * No such feature in Rails anymore. That's Bundler's businessAkira Matsuda2013-01-041-2/+2
| | | | | | | | [ci skip]
* | Merge pull request #8736 from tricknotes/apply-varGuillermo Iguaran2013-01-031-1/+2
|\ \ | | | | | | Apply `var` keyword to js at welcome#index
| * | Apply `var` keyword to js at welcome#indexRyunosuke SATO2013-01-041-1/+2
| | |
* | | Merge pull request #8723 from goshakkk/refactor-error-pageGuillermo Iguaran2013-01-033-5/+27
|\ \ \ | |/ / |/| | Move error page js into script tag
| * | move error page js into script tagGosha Arinich2013-01-043-5/+27
| | |
* | | Set the default timezone after the initialization since the configurationRafael Mendonça França2013-01-042-15/+27
| | | | | | | | | | | | | | | | | | now lives in the application initializers. Fix #8711
* | | Refactor infinite comparable definition a bitCarlos Antonio da Silva2013-01-041-15/+19
| | |
* | | Remove unnecessary requiresRafael Mendonça França2013-01-031-2/+0
| | |
* | | Remove assert_nothing_raisedRafael Mendonça França2013-01-036-67/+49
| | |
* | | Merge pull request #7350 from slbug/date_time_ranges_with_infinite_boundsRafael Mendonça França2013-01-0317-7/+199
|\ \ \ | | | | | | | | Added ability to compare date/time with infinity
| * | | Added ability to compare date/time with infinitybUg2013-01-0417-7/+199
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Date, DateTime, Time and TimeWithZone can now be compared to infinity, so it's now possible to create ranges with one infinite bound and date/time object as another bound. Ex.: @range = Range.new(Date.today, Float::INFINITY) Also it's possible to check inclusion of date/time in range with conversion. Ex.: @range.include?(Time.now + 1.year) # => true @range.include?(DateTime.now + 1.year) # => true Ability to create date/time ranges with infinite bound is required for handling postgresql range types.
* | | Use bundler --pre for travis buildsJeremy Kemper2013-01-031-1/+1
| | |
* | | Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs <gem>'Jeremy Kemper2013-01-031-1/+1
| | |
* | | Reuse the Column integer converterRafael Mendonça França2013-01-031-1/+1
| | |
* | | Change duplicated test nameRafael Mendonça França2013-01-031-2/+2
| | |
* | | Merge pull request #8734 from jstirk/master-column_writer_to_i_errorsRafael Mendonça França2013-01-034-8/+37
|\ \ \ | |_|/ |/| | Fix undefined method `to_i' introduced in 3.2.9
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 21:38:15 +0000