aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #10446 from dasch/instrument-template-compilationRafael Mendonça França2013-05-061-2/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Instrument template compilation
| * | | | | Instrument template compilationDaniel Schierbeck2013-05-061-2/+9
| |/ / / /
* | | | | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-05-061-4/+4
| | | | |
* | | | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-2/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Confirm a record has not already been destroyed before decrementing counter cache Conflicts: activerecord/CHANGELOG.md
| * | | | | Confirm a record has not already been destroyed before decrementingBen Tucker2013-05-063-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counter cache At present, calling destroy multiple times on the same record results in the belongs_to counter cache being decremented multiple times. With this change the record is checked for whether it is already destroyed prior to decrementing the counter cache.
* | | | | | Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | use canonical #controller_path logic in controller test cases
| * | | | | | use canonical #controller_path logic in controller test casesLance Ivy2013-05-051-1/+1
| | | | | | |
* | | | | | | Fix test asserting the sanitized SQL hash differently to some adaptersRafael Mendonça França2013-05-061-1/+7
| | | | | | |
* | | | | | | Merge pull request #10352 from ↵Rafael Mendonça França2013-05-063-4/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zohlgren/fix_activerecord_sanitization_sanitize_sql_hash Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditions
| * | | | | | | Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditionsZach Ohlgren2013-05-063-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing CHANGLOG description Remove extra line. Remove blank lines.
* | | | | | | | Merge pull request #10488 from neerajdotname/10419-bRafael Mendonça França2013-05-061-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | fix failing test caused by 3771e4d511
| * | | | | | | fix failing test caused by 3771e4d511Neeraj Singh2013-05-061-2/+2
| | | | | | | |
* | | | | | | | let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462]Xavier Noria2013-05-061-45/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the comment in the rescue clause towards the top of the patch for the rationale.
* | | | | | | | Merge pull request #10437 from neerajdotname/10419Rafael Mendonça França2013-05-063-1/+49
|\| | | | | | | | | | | | | | | | | | | | | | | raise IrreversibleMigration if no column given
| * | | | | | | raise IrreversibleMigration if no column givenNeeraj Singh2013-05-063-1/+49
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #10419 Following code should raise IrreversibleMigration. But the code was failing since options is an array and not a hash. def change change_table :users do |t| t.remove_index [:name, :email] end end Fix was to check if the options is a Hash before operating on it.
* | | | | | | Merge pull request #10486 from vipulnsward/remove_variableRafael Mendonça França2013-05-061-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove unused variable
| * | | | | | | remove unused variableVipul A M2013-05-061-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #10453 from vipulnsward/destructive_sortJeremy Kemper2013-05-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Speed up Hash#to_param by switching from #sort to #sort!
| * | | | | | | use destructive sort on array in Hash#to_param for performance gains.Vipul A M2013-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check https://gist.github.com/vipulnsward/6aad158c06a22f931a71 to see the gains.
* | | | | | | | Merge pull request #10480 from juno/fix-typoSteve Klabnik2013-05-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo in documentation comment [ci skip]
| * | | | | | | | Fix typo in documentation commentJunya Ogura2013-05-061-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #10467 from ↵Rafael Mendonça França2013-05-051-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | akalyaev/set-correct-backend-for-nokogirisax-engine use nokogirisax as a backend
| * | | | | | | | use nokogirisax as a backendAnton Kalyaev2013-05-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most likely someone just forgot to change it during copying and pasting test cases from nokigiri engine test.
* | | | | | | | | Merge pull request #10476 from prathamesh-sonpatki/gitignoreRafael Mendonça França2013-05-053-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Updated link to to GitHub article about ignoring files [ci skip]
| * | | | | | | | Updated link to to GitHub article about ignoring files [ci skip]Prathamesh Sonpatki2013-05-053-3/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - http://help.github.com/ignore-files redirects to https://help.github.com/articles/ignoring-files
* | | | | | | | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assetsCarlos Antonio da Silva2013-05-051-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix tests related to scaffolding generator with --assets=false switch
| * | | | | | | | Fixes warning 'method redefined' in scaffold generators testsPrathamesh Sonpatki2013-05-051-4/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - f1805a697831 Redefined 'test_scaffold_generator_no_assets' twice. - Only the last instance of these three definitions of the same method was getting called when the tests were actually running. - This commit changes names of this method so that all three definitions will be called - scaffold.css is not generated by --assets=false switch. - Test was expecting the presence of the file with --assets=false - This issue was not discovered in f1805a697831b because it was redefining the same method twice
* | | | | | | | Merge pull request #10468 from ↵Carlos Antonio da Silva2013-05-051-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rimidl/add-missing-require-to-actionview-lookupcontext Added missing `require` to ActionView::LookupContext
| * | | | | | | | Added missing `require` to ActionView::LookupContextVladimir Strakhov2013-05-051-0/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #10472 from prathamesh-sonpatki/githubCarlos Antonio da Silva2013-05-054-14/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Github -> GitHub [ci skip]
| * | | | | | | Github -> GitHub [ci skip]Prathamesh Sonpatki2013-05-054-14/+14
|/ / / / / / /
* | | | | | | Merge pull request #10465 from raphweiner/rake_install_depend_on_buildRafael Mendonça França2013-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make rake install task depend on build instead of gem
* | | | | | | Merge pull request #10464 from arkiver/masterRafael Mendonça França2013-05-042-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix to remove warning in postgres adapter test
| * | | | | | | fix to remove warning on postgres adapter test.Akshay Khole2013-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning was: "/vagrant/rails/activerecord/test/cases/adapters/postgresql/uuid_test.rb:63: warning: ambiguous first argument; put parentheses or even spaces"
| * | | | | | | Changing method call according to coding conventionsAkshay Khole2013-05-051-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #10463 from prathamesh-sonpatki/dirRafael Mendonça França2013-05-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dir -> directory [ci skip]
| * | | | | | | dir -> directory [ci skip]Prathamesh Sonpatki2013-05-041-1/+1
|/ / / / / / /
* | | | | | | Use Ruby 1.9 syntaxRafael Mendonça França2013-05-041-2/+2
| | | | | | |
* | | | | | | Review the CHANGELOG entry [ci skip]Rafael Mendonça França2013-05-041-1/+2
| | | | | | |
* | | | | | | Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-masterRafael Mendonça França2013-05-043-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes Scaffold generator with --assets=false
| * | | | | | | Fixes Scaffold generator with --assets=falseArun Agrawal2013-05-043-0/+20
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scaffold generator with --assets=false option outputs an error See #9525
* | | | | | | Merge pull request #10458 from bwbuchanan/issue-10451Rafael Mendonça França2013-05-043-2/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make SchemaDumper emit "id: :uuid" when using UUID primary keys
| * | | | | | | Make SchemaDumper emit "id: :uuid" when appropriate. Fixes #10451.Brian Buchanan2013-05-033-2/+18
| |/ / / / / /
* | | | | | | Merge pull request #10436 from NARKOZ/keep-imagesRafael Mendonça França2013-05-043-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | generate 'app/assets/images' directory when creating new rails app. Fixes #10434
| * | | | | | | generate 'app/assets/images' directory when creating new rails appNihad Abbasov2013-05-043-0/+6
| | | | | | | |
* | | | | | | | Merge pull request #10461 from rwz/masterRafael Mendonça França2013-05-042-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Relaxed jbuilder dependency in Gemfile template
| * | | | | | | | Relaxed jbuilder dependency in Gemfile templatePavel Pravosud2013-05-043-3/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #10457 from zenspider/squishy_test_order_dependenciesAaron Patterson2013-05-034-6/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed bad tests to clean up after themselves.
| * | | | | | | | | Fixed bad tests to clean up after themselves.Ryan Davis2013-05-034-6/+27
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10452 from rubys/rails_version_testRafael Mendonça França2013-05-031-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a test case for comparing Rails versions
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 01:35:18 +0000