aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #11677 from jaggederest/masterRafael Mendonça França2013-08-041-1/+1
|\ \ \ \ \ \
| * | | | | | remove language about configuring digest method [ci skip]Justin George2013-07-311-1/+1
| * | | | | | update guide to reflect default HMAC SHA1 in MessageVerifier used in SignedCo...Justin George2013-07-301-1/+1
* | | | | | | Merge pull request #11693 from egilburg/minor_relation_refactorRafael Mendonça França2013-08-041-38/+45
|\ \ \ \ \ \ \
| * | | | | | | Minor optimization and code cleanup in query_methods.Eugene Gilburg2013-07-311-38/+45
* | | | | | | | Merge pull request #11749 from Alamoz/getting_started_guideRafael Mendonça França2013-08-041-0/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Added to 'Security' section; especially reference to 'Ruby on Rails Security ...Adrien Lamothe2013-08-041-0/+15
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #11737 from tkhr/fix-document-about-on-validation-helpersRafael Mendonça França2013-08-041-3/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix active_record_validations.md document, `:save` for `on:` validation helpe...Takehiro Adachi2013-08-041-3/+2
* | | | | | | | No need to use blocks hereAndrew White2013-08-041-11/+9
* | | | | | | | Fix unused variable warningAndrew White2013-08-041-0/+1
* | | | | | | | Remove "Using Action View outside of Rails" section from AV overview guideGuillermo Iguaran2013-08-041-69/+0
* | | | | | | | :scissors:Rafael Mendonça França2013-08-031-3/+3
* | | | | | | | No need to abbreviate applicationRafael Mendonça França2013-08-031-1/+1
* | | | | | | | Merge pull request #11747 from bradly/guides_getting_started_fixRafael Mendonça França2013-08-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add note that you must be in the rails app directory when starting up the ser...Bradly Feeley2013-08-031-1/+1
* | | | | | | | | Merge pull request #11733 from iainbeeston/masterRafael Mendonça França2013-08-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated the guide to say that the localisation file for validation messages i...Iain Beeston2013-08-031-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #11600 from jasiek/masterRafael Mendonça França2013-08-031-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed an unnecessary loop - it kills performance on large texts.Jan Szumiec2013-08-031-4/+6
* | | | | | | | | | 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