aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10041 from vipulnsward/more_destructive_mergeSantiago Pastorino2013-04-022-2/+2
|\
| * change merge to merge! in AS on new hashesVipul A M2013-04-022-2/+2
* | Merge pull request #10042 from choudhuryanupam/fix_activesupport_testSantiago Pastorino2013-04-026-25/+37
|\ \ | |/ |/|
| * Added missing assertAnupam Choudhury2013-04-026-25/+37
|/
* Revert "Use jquery-rails from github"Santiago Pastorino2013-04-021-3/+1
* Revert "Use jquery-rails from github (fix Gem::Version error)"Santiago Pastorino2013-04-011-1/+1
* Merge pull request #10036 from wangjohn/norecord_error_message_consistency_is...Rafael Mendonça França2013-04-012-3/+1
|\
| * Updated the error message for +find+ on an inverse_of associationwangjohn2013-04-012-3/+1
|/
* Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184aSantiago Pastorino2013-04-013-10/+27
* Revert more Rails.version changesRafael Mendonça França2013-04-014-5/+5
* Merge pull request #10022 from wangjohn/find_on_nonexistent_id_raises_errorRafael Mendonça França2013-04-013-12/+55
|\
| * Throwing a RecordNotFound exception when a record is scanned using thewangjohn2013-04-013-12/+55
* | :scissors:Rafael Mendonça França2013-04-011-4/+4
|/
* Merge pull request #10033 from kalabiyau/fix_typo_on_ap_mime_types_testRafael Mendonça França2013-04-011-1/+1
|\
| * Fixed typo on AP dispatch Mime::Type testKalabiYau2013-04-011-1/+1
* | Remove CHANGELOG entry for #10002Rafael Mendonça França2013-04-011-4/+0
* | Merge pull request #10002 from charliesome/revert-version-method-on-railsJeremy Kemper2013-04-013-13/+16
|\ \ | |/ |/|
| * reverts changes to Rails.version made in #8501Charlie Somerville2013-03-303-13/+16
* | :uniq is still a valid relation option since it was only silentlyRafael Mendonça França2013-04-011-1/+1
* | Merge pull request #10031 from trevorturk/cookie-store-auto-upgrade-docsSantiago Pastorino2013-04-012-23/+40
|\ \
| * | Improve documentation around the cookie store auto-upgrade to encryptionTrevor Turk2013-04-012-23/+40
* | | Merge pull request #10010 from pwnall/fix_ref_index_trueRafael Mendonça França2013-04-011-1/+1
|\ \ \
| * | | Make references with index:true pass Hash options to add_index.Victor Costan2013-04-011-1/+1
* | | | Move the class methods to above the protected sectionRafael Mendonça França2013-04-013-47/+36
* | | | Merge pull request #10021 from pabloh/refactor_rails_generator_test_caseRafael Mendonça França2013-04-014-211/+259
|\ \ \ \
| * | | | Break down Rails::Generator::TestCase into modulesPablo Herrero2013-03-314-211/+259
* | | | | Merge pull request #10025 from masarakki/fix_detect_enum_column_on_mysqlRafael Mendonça França2013-04-015-6/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix detect column type of enummasarakki2013-04-015-6/+6
| |/ / /
* | | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-0111-99/+239
|\ \ \ \
| * | | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; Au...Trevor Turk2013-03-2811-99/+239
* | | | | Merge pull request #10026 from ogawaso/typoSantiago Pastorino2013-04-011-2/+2
|\ \ \ \ \
| * | | | | typo recomend -> recommendogawaso2013-04-011-2/+2
|/ / / / /
* | / / / gist for Active Record issues [Neeraj Singh & Xavier Noria]Xavier Noria2013-04-013-1/+90
| |/ / / |/| | |
* | | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-selectCarlos Antonio da Silva2013-03-312-4/+23
|\ \ \ \
| * | | | Add regression test for TZ grepBrian McManus2013-03-271-0/+20
| * | | | Revert grep to select since they are not the sameBrian McManus2013-03-272-4/+3
* | | | | Merge pull request #10013 from vipulnsward/fix_request_method_testSantiago Pastorino2013-03-311-6/+2
|\ \ \ \ \
| * | | | | fix request methods testVipul A M2013-03-311-6/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #10017 from vipulnsward/railties_cleanupsSteve Klabnik2013-03-313-6/+5
|\ \ \ \ \
| * | | | | cleanup railties test; fix typosVipul A M2013-03-313-6/+5
| |/ / / /
* | | | | Merge pull request #10015 from vipulnsward/remove_unused_variable_in_getSteve Klabnik2013-03-312-2/+2
|\ \ \ \ \
| * | | | | remove unused variable and assignmentVipul A M2013-03-312-2/+2
| |/ / / /
* | | | | Merge pull request #10014 from vipulnsward/remove_unused_match_varSteve Klabnik2013-03-311-8/+8
|\ \ \ \ \
| * | | | | remove unused match variables in selectorVipul A M2013-03-311-8/+8
| |/ / / /
* | | | | Merge pull request #10012 from vipulnsward/fix_AP_error_message_errorSteve Klabnik2013-03-311-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix wrong argument error messageVipul A M2013-03-311-1/+1
|/ / / /
* | | | Make comment about uglifier in generated Gemfile consistent between branchesCarlos Antonio da Silva2013-03-301-1/+1
* | | | Fix indent and change "or" usage to "||" in schema dumper testsCarlos Antonio da Silva2013-03-301-5/+5
* | | | Improve AP changelog entry about layout method with nil returnCarlos Antonio da Silva2013-03-301-4/+4
* | | | Refactor index algorithm lookup so that it only builds the available options ...Carlos Antonio da Silva2013-03-301-4/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 04:21:37 +0000