aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #11738 from gaurish/guides-association-basics-fixRafael Mendonça França2013-08-031-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [Fixes #11734]Correct Association Basics Guide on has_and_belongs_to_many[ci ...Gaurish Sharma2013-08-031-2/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #11740 from Karunakar/self_tableRafael Mendonça França2013-08-031-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Changing the def self.table_name to self.table_name in the column_name.rbKarunakar (Ruby)2013-08-031-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #11744 from Karunakar/minor_fix_on_flatmapRafael Mendonça França2013-08-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | used flat_map instead of map.flatten in /guides/rails_guides/helpers.rbKarunakar (Ruby)2013-08-041-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #11707 from nathanstitt/extname_optionRafael Mendonça França2013-08-033-3/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Add "extname" option to javascript_include_tagNathan Stitt2013-08-033-3/+27
* | | | | | | | | Merge pull request #11741 from Karunakar/failing_test_in_localRafael Mendonça França2013-08-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix for postgresql failing test in localKarunakar (Ruby)2013-08-041-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #11730 from neerajdotname/use_flat_mapYves Senn2013-08-031-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | use flat_mapNeeraj Singh2013-08-031-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #11736 from gaurish/avoid-multibyte-method-defineGuillermo Iguaran2013-08-031-3/+4
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Avoid calling define_method with non-english chars in InflectorTestGaurish Sharma2013-08-031-3/+4
| |/ / / / / /
* | | | | | | Merge pull request #11735 from arunagw/av-warning-removed-masterYves Senn2013-08-031-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Using URI.parser.unescapeArun Agrawal2013-08-031-2/+2
|/ / / / / /
* | | | | | Revert "Isolate railties Generators Tests"Guillermo Iguaran2013-08-021-1/+0
* | | | | | Merge pull request #11726 from atambo/isolate_generator_testsGuillermo Iguaran2013-08-021-0/+1
|\ \ \ \ \ \
| * | | | | | Isolate railties Generators TestsAlex Tambellini2013-08-021-0/+1
|/ / / / / /
* | | | | | add a test for concat on hm:t associationsAaron Patterson2013-08-021-0/+7
* | | | | | Merge pull request #11721 from gaurish/join-timeoutGuillermo Iguaran2013-08-021-1/+1
|\ \ \ \ \ \
| * | | | | | Add timeout to test_async_streamGaurish Sharma2013-08-021-1/+1
* | | | | | | Merge pull request #11725 from atambo/jruby_capture_unlinkGuillermo Iguaran2013-08-021-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix jruby warning when capture calls unlink on an open tempfileAlex Tambellini2013-08-021-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #11712 from atambo/activesupport_testing_isolation_jrubyRafael Mendonça França2013-08-021-48/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix ActiveSupport::Testing::Isolation on jrubyAlex Tambellini2013-08-021-48/+4
* | | | | | | | Merge pull request #11722 from arunagw/removed-deprecation-silenced-from-testRafael Mendonça França2013-08-021-2/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | As we are doing debug mode onArun Agrawal2013-08-021-2/+0
| |/ / / / / /
* | | | | | | Merge pull request #11716 from jetthoughts/use_backquote_for_terms_in_getting...Carlos Antonio da Silva2013-08-021-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Replaced quotation marks for term by apostrophePaul Nikitochkin2013-08-021-2/+2
* | | | | | | | Merge pull request #11720 from arunagw/added-av-in-rails-infoGuillermo Iguaran2013-08-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Added action_view in Rails::InfoArun Agrawal2013-08-021-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #11455 from antonio/fix_enable_extension_not_being_definedRafael Mendonça França2013-08-023-0/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Define enable_extension method to prevent undefined method errorAntonio Santos2013-08-023-0/+32
* | | | | | | | | Merge pull request #11718 from rShetty/patch-4Rafael Mendonça França2013-08-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix a gramatical mistakeRajeev N Bharshetty2013-08-021-1/+1
* | | | | | | | | | Use assert_nil instead of testing for equalityCarlos Antonio da Silva2013-08-022-3/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #11714 from jetthoughts/11706_remove_bad_override_of_xmlRafael Mendonça França2013-08-023-7/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed redundant xml override from pg adapterPaul Nikitochkin2013-08-023-7/+47
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #11717 from rajcybage/fix_mapRafael Mendonça França2013-08-021-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | map => map! for stopping extra array creationRajarshi Das2013-08-021-1/+1
|/ / / / / / / /
* | | | | | | | Use map! to avoid an extra object creationCarlos Antonio da Silva2013-08-021-1/+1
* | | | | | | | Remove useless begin..endCarlos Antonio da Silva2013-08-021-2/+1
* | | | | | | | Merge pull request #11713 from rajcybage/fix_changelogCarlos Antonio da Silva2013-08-022-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix the changelog typo[ci skip]Rajarshi Das2013-08-022-2/+2
|/ / / / / / /
* | | | | | | extract habtm handling to a methodAaron Patterson2013-08-011-8/+12
* | | | | | | use drop and avoid a range objectAaron Patterson2013-08-011-1/+1
* | | | | | | Merge pull request #11709 from yahonda/case_sensitiveRafael Mendonça França2013-08-012-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Change test_registering_new_handlers and test_count_on_invalid_columns_raisesYasuo Honda2013-08-022-2/+2
* | | | | | | | Make current_page? compare binary stringsRafael Mendonça França2013-08-012-3/+12
|/ / / / / / /