aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7408 from yahonda/sqlmode_mysqlCarlos Antonio da Silva2012-08-212-6/+8
|\ | | | | | | | | Change mysql tests for strict mode disabled to work with new sql_mode default in MySQL 5.6.6-m9. Since this MySQL version, the sql_mode default value is `NO_ENGINE_SUBSTITUTION`.
| * Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_modeYasuo Honda2012-08-222-6/+8
|/ | | | | | | | | Reason since MySQL 5.6.6-m9 the `sql_mode` default value is `NO_ENGINE_SUBSTITUTION`. This default parameter change is out of control from Rails. This test verifies Rails not overriding the default `@@GLOBAL.sql_mode` value by checking if `@@GLOBAL.sql_mode` is the same as `@@SESSION.sql_mode`.
* Merge pull request #7406 from janko-m/documentation_fixesRafael Mendonça França2012-08-212-45/+45
|\ | | | | Fixed some documentation mistakes
| * Fix documentation mistakesJanko Marohnić2012-08-212-45/+45
| |
* | Merge pull request #7000 from kennyj/fix_6697-3Rafael Mendonça França2012-08-218-11/+31
|\ \ | | | | | | Use instance_accessor: false instead of instance_writer.
| * | Use instance_accessor: false instead of instance_writer.kennyj2012-08-218-11/+31
|/ /
* | Add CHANGELOG entry for #6986Rafael Mendonça França2012-08-211-0/+5
| |
* | Merge pull request #6986 from kennyj/fix_6975Rafael Mendonça França2012-08-212-5/+29
|\ \ | | | | | | | | | Fix #6975. Round usec when writing timestamp attribute.
| * | Round usec when writing timestamp attribute.kennyj2012-08-212-5/+29
|/ /
* | Minor refactoring in Active Record model schema methodsCarlos Antonio da Silva2012-08-211-5/+3
| | | | | | | | | | | | * Use each_key instead of generating intermediate keys array. * Use each_with_object instead of inject to build hash. * Use ternary to return instead of if + assignment.
* | removing dead codeAaron Patterson2012-08-201-19/+7
| |
* | define singleton methods rather than adding and removing methodsAaron Patterson2012-08-201-45/+32
| |
* | remove dead codeAaron Patterson2012-08-201-78/+36
| |
* | initialize instance variables for transactions to remove conditionalsAaron Patterson2012-08-202-8/+7
| |
* | This method is useless without a block, so remove testAaron Patterson2012-08-201-11/+9
| |
* | remove unused variableAaron Patterson2012-08-201-1/+1
| |
* | initialize instance variables to avoid conditionalsAaron Patterson2012-08-201-2/+7
| |
* | fix whitespace errorsAaron Patterson2012-08-201-2/+2
| |
* | Revert "removes unused optional argument in AS::Dependencies::Loadable#load"Xavier Noria2012-08-201-1/+1
| | | | | | | | | | | | This argument is there because that's the signature of Kernel#load. This reverts commit bf3fa34ed0aa33bca3aac9c96165662fe864a7b4.
* | removes unused optional argument in AS::Dependencies::Loadable#loadXavier Noria2012-08-201-1/+1
| |
* | Merge pull request #7401 from frodsan/fix_environments_punctuationCarlos Antonio da Silva2012-08-207-12/+12
|\ \ | | | | | | Fix punctuation in config templates [ci skip]
| * | fix punctuation in config templatesFrancesco Rodriguez2012-08-207-12/+12
|/ /
* | Make sure :via works with mountPratik Naik2012-08-202-2/+12
| |
* | Merge pull request #7396 from tomykaira/cleanup_testRafael Mendonça França2012-08-201-11/+11
|\ \ | |/ |/| Access @rs only through attr_accessor
| * Access @rs only through attr_accessortomykaira2012-08-201-11/+11
|/
* removes the second argument of the AS const_missing hookXavier Noria2012-08-191-8/+22
| | | | | | | | | | | | | | | Ruby does not pass the nesting to const_missing (unfortunately). That second argument was there in case that changed, Yehuda sent a patch to MRI http://bugs.ruby-lang.org/issues/2740 but there is not much movement there and Matz told me in Amsterdam there was no immediate plan to pass the nesting. So let's go back to implement what happens now, and if in the future we get the nesting then we will adapt this. Double-checked this with Mr Katz.
* Remove private verify readonly attr methodCarlos Antonio da Silva2012-08-191-5/+1
| | | | | | | | | | This method was added to be shared between update_attribute and update_column in 50725cec397d4fa0ecf1dda4e6ae845a993f1ba7, but since update_attribute was removed, and update_column has changed to delegate to update_columns, the method is not used anywhere anymore. Also remove "key.to_s" conversion when raising readonly error, since the key is being interpolated.
* no need for AS::Dependencies.(hook!|unhook!) to return anything in particularXavier Noria2012-08-191-2/+0
|
* Merge pull request #7392 from ernie/real-fix-for-last-equality-wins-in-mergeRafael Mendonça França2012-08-192-14/+12
|\ | | | | Fix "last equality wins" logic in relation merge
| * Fix "last equality wins" logic in relation mergeErnie Miller2012-08-192-14/+12
|/ | | | | | This is a real fix (as compared to the band-aid in b127d86c), which uses the recently-added equality methods for ARel nodes. It has the side benefit of simplifying the merge code a bit.
* Merge pull request #7377 from ↵Carlos Antonio da Silva2012-08-183-1/+11
|\ | | | | | | | | brainopia/use_inversed_parent_for_first_and_last_child Use inversed parent for first and last child of has_many association
| * Use inversed parent for first and last child of has_many associationbrainopia2012-08-183-1/+11
| |
* | Merge pull request #7390 from ↵Rafael Mendonça França2012-08-184-5/+9
|\ \ | | | | | | | | | | | | aantix/add_x_content_type_options_to_default_headers Added X-Content-Type-Options to the header defaults.
| * | Added X-Content-Type-Options to the header defaults.Jim Jones2012-08-184-5/+9
|/ / | | | | | | With a value of "nosniff", this prevents Internet Explorer from MIME-sniffing a response away from the declared content-type.
* | Merge branch 'multiparameter-attributes-refactor'Carlos Antonio da Silva2012-08-182-76/+104
|\ \ | |/ |/| | | Refactor multiparameter attributes assignment implementation.
| * Get rid of some arguments by using the accessorsCarlos Antonio da Silva2012-08-181-30/+31
| | | | | | | | | | Cleans up a lot of noise from arguments being passed from one method to another.
| * Move multiparameter attribute logic to a classCarlos Antonio da Silva2012-08-181-72/+84
| | | | | | | | | | This should make it easier to refactor and improve this code, and remove complexity with params going around here and there.
| * Some more cleanup to use Hash#values_at, and some method docsCarlos Antonio da Silva2012-08-181-3/+7
| |
| * Use cached column information to instantiate time objectCarlos Antonio da Silva2012-08-181-6/+6
| |
| * Refactor blank date parameter validationCarlos Antonio da Silva2012-08-181-2/+6
| |
| * Refactor missing parameter validation based on positionCarlos Antonio da Silva2012-08-182-8/+12
| |
| * Reuse already fetched column to check for :timeCarlos Antonio da Silva2012-08-181-5/+6
| | | | | | | | | | Avoid doing a new column lookup for the attribute, since we already have the column to check for the klass.
| * Refactor some code in multiparameter assignmentCarlos Antonio da Silva2012-08-181-26/+25
| | | | | | | | | | Move some methods to the top to better organize them, since they're used right at the beginning of the multiparameter assignment method chain.
| * Extract nested parameter assignment to a separate methodCarlos Antonio da Silva2012-08-181-3/+6
|/
* Merge pull request #6903 from guilleiguaran/dalli-memcache-storeSantiago Pastorino2012-08-175-42/+37
|\ | | | | Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache::MemCacheStore
| * Add test to cover increment/decrement of non-existing key in MemCacheStoreGuillermo Iguaran2012-08-171-0/+2
| |
| * Replace deprecated `memcache-client` gem with `dalli` in ↵Guillermo Iguaran2012-08-175-42/+35
|/ | | | | | ActiveSupport::Cache::MemCacheStore memcache-client was deprecated in favour of dalli in 2010.
* Merge pull request #7380 from ↵Aaron Patterson2012-08-172-2/+21
|\ | | | | | | | | ernie/fix-nomethoderror-on-non-attribute-equalities Fix merge error when Equality LHS is non-attribute
| * Fix merge error when Equality LHS is non-attributeErnie Miller2012-08-172-2/+21
| | | | | | | | | | | | | | | | | | This is at best a band-aid for a more proper fix, since it won't truly handle the removal of the previous equality condition of these other nodes. I'm planning to put in some work on ARel toward supporting that goal. Related: rails/arel#130, ernie/squeel#153, ernie/squeel#156
* | Merge pull request #7381 from IPGlider/masterRafael Mendonça França2012-08-171-2/+2
|\ \ | | | | | | Update to activerecord-deprecated_finders on generator
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 09:41:27 +0000