aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5321 from pfeiffer/uniqueness_validator_conditionsJosé Valim2012-03-172-2/+30
|\ | | | | Add :conditions option to uniqueness validator
| * Correct grammar in documentationMattias Pfeiffer2012-03-071-1/+1
| |
| * Change syntax to accept an AR::Relation instead of old conditions hash/array.Mattias Pfeiffer2012-03-072-4/+10
| |
| * Add :conditions option to uniqueness validatorMattias Pfeiffer2012-03-072-2/+24
| |
* | Merge pull request #5487 from kennyj/should_use_argumentJosé Valim2012-03-171-1/+1
|\ \ | | | | | | Should use an argument in http_digest_authentication_test.rb
| * | Should use an argument in http_digest_authentication_test.rbkennyj2012-03-171-1/+1
|/ /
* | Merge pull request #5470 from sandeepravi/warning_fixesJosé Valim2012-03-171-0/+5
|\ \ | | | | | | fixed - warning: instance variable @controller not initialized
| * | fixed - warning: instance variable @controller not initializedSandeep2012-03-161-0/+5
| | |
* | | Merge pull request #5483 from luke-gru/gemfile_changeJosé Valim2012-03-171-1/+1
|\ \ \ | | | | | | | | switch rack-test in Gemfile to using git protocol
| * | | switch rack-test in Gemfile to using git protocolLuke Gruber2012-03-161-1/+1
| | | | | | | | | | | | | | | | can't run tests if git not compiled with libcurl
* | | | Merge pull request #5484 from luke-gru/consistent_module_namingXavier Noria2012-03-163-6/+6
|\ \ \ \ | |/ / / |/| | | use consistent explicit module inclusion
| * | | use consistent explicit module inclusionLuke Gruber2012-03-163-6/+6
|/ / / | | | | | | | | | aid ease of understanding and readability for tests
* | | Merge pull request #5475 from rafaelfranca/fix-buildPiotr Sarnacki2012-03-161-12/+15
|\ \ \ | | | | | | | | Fix ActiveRecord::Relation#blank? tests
| * | | Fix ActiveRecord::Relation#blank? testsRafael Mendonça França2012-03-161-12/+15
|/ / /
* | | use empty? on the hash to avoid another method callAaron Patterson2012-03-161-1/+1
| | |
* | | removed unnecessary calls to "freeze"Aaron Patterson2012-03-161-2/+1
| | |
* | | remove some mocha stubsAaron Patterson2012-03-161-6/+11
| | |
* | | make stubbing Time.now easierAaron Patterson2012-03-161-1/+7
| | |
* | | Merge pull request #5469 from yakko/masterJosé Valim2012-03-161-0/+19
|\ \ \ | |/ / |/| | tests for Relation .present? .blank?
| * | test relation presence fixThiago Almeida2012-03-161-4/+4
| | |
| * | tests for Relation .present? and .blank? are check cases and shouldn't force ↵Thiago Almeida2012-03-161-0/+19
| | | | | | | | | | | | sql-count
* | | Merge pull request #5468 from sandeepravi/warning_fixesSantiago Pastorino2012-03-161-1/+1
|\ \ \ | | | | | | | | fixed - warning: ambiguous first argument; put parentheses or even spaces
| * | | fixed - warning: ambiguous first argument; put parentheses or even spacesSandeep2012-03-161-1/+1
|/ / /
* | | Speed up mass assignment by avoiding extra loops.José Valim2012-03-161-7/+5
| | |
* | | Merge pull request #5467 from bogdan/initialize_callbacksJosé Valim2012-03-161-1/+1
|\ \ \ | | | | | | | | ActiveRecord::Core#initialize: improve performance
| * | | ActiveRecord::Core#initialize: improve performanceBogdan Gusiev2012-03-151-1/+1
| | | |
* | | | Merge pull request #5466 from carlosantoniodasilva/as-reviewJosé Valim2012-03-169-71/+36
|\ \ \ \ | | | | | | | | | | Remove deprecation from AS::Deprecation behavior, some minor cleanups
| * | | | Remove deprecation from AS::Deprecation behavior, some minor cleanupsCarlos Antonio da Silva2012-03-169-71/+36
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor log subscriber, use select! to avoid a new object * Remove deprecation messages related to AS::Deprecation behavior This was added about 2 years ago for Rails 3: https://github.com/rails/rails/commit/d4c7d3fd94e5a885a6366eaeb3b908bb58ffd4db * Remove some not used requires * Refactor delegate to avoid string conversions and if statements inside each block
* | | | Merge pull request #5465 from sandeepravi/warning_fixesJosé Valim2012-03-161-1/+1
|\ \ \ \ | | | | | | | | | | fixed - warning: assigned but unused variable - checker
| * | | | fixed - warning: assigned but unused variable - checkerSandeep2012-03-161-1/+1
|/ / / /
* | | | Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgsPiotr Sarnacki2012-03-161-2/+2
|\ \ \ \ | | | | | | | | | | Fix exceptions messages in AC layouts
| * | | | Fix exceptions messages in AC layoutsAlexey Vakhov2012-03-101-2/+2
| | | | |
* | | | | Merge pull request #5461 from yakko/masterJosé Valim2012-03-161-0/+4
|\ \ \ \ \ | | |_|/ / | |/| | | relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)
| * | | | relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)Thiago Almeida2012-03-161-0/+4
| | | | |
* | | | | Merge pull request #5327 from kennyj/fix_explicitly_inheraitance_columnAaron Patterson2012-03-152-1/+12
|\ \ \ \ \ | |/ / / / |/| | | | Don't reset inheritance_column when setting explicitly.
| * | | | Don't reset inheritance_column when setting explicitly.kennyj2012-03-082-1/+12
| | | | |
* | | | | Merge pull request #5454 from luke-gru/luke-devPiotr Sarnacki2012-03-152-4/+44
|\ \ \ \ \ | | | | | | | | | | | | allow zero-arity proc for AbstrController::layout
| * | | | | allow zero-arity proc for AbstrController::layoutLuke Gruber2012-03-152-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proc without parameters can now be given to AbstractController::layout
* | | | | | Merge pull request #5457 from brianmario/typo-fixAaron Patterson2012-03-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo in redirect test
| * | | | | | fix typo in redirect testBrian Lopez2012-03-151-1/+1
|/ / / / / /
* | | | | | Merge pull request #5456 from brianmario/redirect-sanitizationAaron Patterson2012-03-153-2/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Strip null bytes from Location header
| * | | | | strip null bytes from Location header as wellBrian Lopez2012-03-153-2/+22
|/ / / / / | | | | | | | | | | | | | | | add tests for stripping \r\n chars since that's already happening
* | | | | errors should probably be logged as errorsAaron Patterson2012-03-151-20/+19
| | | | |
* | | | | Merge pull request #5451 from yahonda/address_hstores_failueAaron Patterson2012-03-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Address the dump file format for hstore
| * | | | | Address the dump file format for hstoreYasuo Honda2012-03-151-1/+1
|/ / / / /
* | | | | Revert "AM::MassAssingmentSecurity: improve performance"José Valim2012-03-152-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It introduces backwards incompatible changes in the API. This reverts commit 7d1379ffdbbaf01e99833dc06611b7e4f3799522.
* | | | | Merge pull request #5437 from kennyj/fix_5430Aaron Patterson2012-03-152-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
| * | | | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.kennyj2012-03-152-1/+8
| | | | | |
* | | | | | Merge pull request #5337 from mreinsch/static_invalid_byte_sequenceAaron Patterson2012-03-152-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix ArgumentError being raised in case of invalid byte sequences
| * | | | | | fix ArgumentError being raised in case of invalid byte sequencesMichael Reinsch2012-03-082-0/+5
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 14:48:38 +0000