aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use released sdocSantiago Pastorino2013-04-021-1/+1
|
* Merge pull request #10041 from vipulnsward/more_destructive_mergeSantiago Pastorino2013-04-022-2/+2
|\ | | | | change merge to merge! in AS on new hashes
| * 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 assert
| * Added missing assertAnupam Choudhury2013-04-026-25/+37
|/
* Revert "Use jquery-rails from github"Santiago Pastorino2013-04-021-3/+1
| | | | | | | This reverts commit 7a9a7007637b8279501770be03bd84ce83d61ab8. Conflicts: railties/lib/rails/generators/app_base.rb
* Revert "Use jquery-rails from github (fix Gem::Version error)"Santiago Pastorino2013-04-011-1/+1
| | | | This reverts commit 6f3f0f86332004fcee5c2f05d52bbff08c22f980.
* Merge pull request #10036 from ↵Rafael Mendonça França2013-04-012-3/+1
|\ | | | | | | | | wangjohn/norecord_error_message_consistency_issues Updated the error message for find to stay consistent across Rails
| * Updated the error message for +find+ on an inverse_of associationwangjohn2013-04-012-3/+1
|/ | | | | so that it is consistent with the error thrown for +find+ without an inverse_of association.
* Fix release task after ceb3b8717beb9818fbfbab429a8aa697591e184aSantiago Pastorino2013-04-013-10/+27
|
* Revert more Rails.version changesRafael Mendonça França2013-04-014-5/+5
| | | | Related with ed8df3ff018d17fad123e48c7cb907332e72e7dc
* 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 the inverse_of option
| * Throwing a RecordNotFound exception when a record is scanned using thewangjohn2013-04-013-12/+55
| | | | | | | | | | inverse_of option. I've also refactored the code for raising a RecordNotFound exception when searching for records with ids.
* | :scissors:Rafael Mendonça França2013-04-011-4/+4
|/ | | | [ci skip]
* 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 test
| * 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
| | | | | | | | [ci skip]
* | Merge pull request #10002 from charliesome/revert-version-method-on-railsJeremy Kemper2013-04-013-13/+16
|\ \ | |/ |/| Reverts changes to Rails.version made in #8501
| * 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
| | | | | | | | | | | | | | | | deprecated Fixes activerecord-deprecated_finders build. https://travis-ci.org/rails/activerecord-deprecated_finders/builds/5964703
* | 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 encryption
| * | 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
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | Refactor Rails::Generator::TestCase into modules
| * | | | 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 enum
| * | | | fix detect column type of enummasarakki2013-04-015-6/+6
| |/ / / | | | | | | | | | | | | enum includes text or blob or ... hooked by wrong regex
* | | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-0111-99/+239
|\ \ \ \ | | | | | | | | | | Cookie-base session store auto-upgrade
| * | | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵Trevor Turk2013-03-2811-99/+239
| | | | | | | | | | | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config
* | | | | Merge pull request #10026 from ogawaso/typoSantiago Pastorino2013-04-011-2/+2
|\ \ \ \ \ | | | | | | | | | | | | typo recomend -> recommend
| * | | | | typo recomend -> recommendogawaso2013-04-011-2/+2
|/ / / / /
* | / / / gist for Active Record issues [Neeraj Singh & Xavier Noria]Xavier Noria2013-04-013-1/+90
| |/ / / |/| | | | | | | | | | | This commit closes issue #9775.
* | | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-selectCarlos Antonio da Silva2013-03-312-4/+23
|\ \ \ \ | | | | | | | | | | Revert grep to select since they are not the same
| * | | | Add regression test for TZ grepBrian McManus2013-03-271-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a regression test that will fail if anyone tries to change time_zone_select to use grep again thinking it will work when it does not.
| * | | | Revert grep to select since they are not the sameBrian McManus2013-03-272-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous commit swapped out a call to select for a call to grep in time_zone_options_for_select. This behavior actually causes the regexp priority option to stop working. ActiveSupport::TimeZone overrides the =~ operator which is what the select block was using previously. Enumerable#grep checks pattern === element and in this case that would be /US/ === ActiveSupport::TimeZone which does not work because ActiveSupport::TimeZone does not supply an implicit converting to_str method, only an explicit to_s method. It would be impossible to provide a to_str method that behaves identically to the =~ method provided on ActiveSupport::TimeZone so the only option is to revert back to using select with =~.
* | | | | Merge pull request #10013 from vipulnsward/fix_request_method_testSantiago Pastorino2013-03-311-6/+2
|\ \ \ \ \ | | | | | | | | | | | | fix request methods test
| * | | | | 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 typos
| * | | | | 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 assignment
| * | | | | 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 selector
| * | | | | 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 message [ci skip]
| * | | | 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
| | | | | | | | | | | | | | | | Introduced in 59d20af2238f7ab553f41b96282722889d8d4393.
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about getting the "no layout" behavior by returning "false" to make it easier for people that might need to change their code. Related to #8458. [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:04:35 +0000