| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | Fix documentation mistakes | Janko Marohnić | 2012-08-21 | 2 | -45/+45 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #7000 from kennyj/fix_6697-3 | Rafael Mendonça França | 2012-08-21 | 8 | -11/+31 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Use instance_accessor: false instead of instance_writer. | |||||
| | * | | | | | | Use instance_accessor: false instead of instance_writer. | kennyj | 2012-08-21 | 8 | -11/+31 | |
| |/ / / / / / | ||||||
| * | | | | | | Add CHANGELOG entry for #6986 | Rafael Mendonça França | 2012-08-21 | 1 | -0/+5 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #6986 from kennyj/fix_6975 | Rafael Mendonça França | 2012-08-21 | 2 | -5/+29 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix #6975. Round usec when writing timestamp attribute. | |||||
| | * | | | | | | Round usec when writing timestamp attribute. | kennyj | 2012-08-21 | 2 | -5/+29 | |
| |/ / / / / / | ||||||
| * | | | | | | Minor refactoring in Active Record model schema methods | Carlos Antonio da Silva | 2012-08-21 | 1 | -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 code | Aaron Patterson | 2012-08-20 | 1 | -19/+7 | |
| | | | | | | | ||||||
| * | | | | | | define singleton methods rather than adding and removing methods | Aaron Patterson | 2012-08-20 | 1 | -45/+32 | |
| | | | | | | | ||||||
| * | | | | | | remove dead code | Aaron Patterson | 2012-08-20 | 1 | -78/+36 | |
| | | | | | | | ||||||
| * | | | | | | initialize instance variables for transactions to remove conditionals | Aaron Patterson | 2012-08-20 | 2 | -8/+7 | |
| | | | | | | | ||||||
| * | | | | | | This method is useless without a block, so remove test | Aaron Patterson | 2012-08-20 | 1 | -11/+9 | |
| | | | | | | | ||||||
| * | | | | | | remove unused variable | Aaron Patterson | 2012-08-20 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | initialize instance variables to avoid conditionals | Aaron Patterson | 2012-08-20 | 1 | -2/+7 | |
| | | | | | | | ||||||
| * | | | | | | fix whitespace errors | Aaron Patterson | 2012-08-20 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Revert "removes unused optional argument in AS::Dependencies::Loadable#load" | Xavier Noria | 2012-08-20 | 1 | -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#load | Xavier Noria | 2012-08-20 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #7401 from frodsan/fix_environments_punctuation | Carlos Antonio da Silva | 2012-08-20 | 7 | -12/+12 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix punctuation in config templates [ci skip] | |||||
| | * | | | | | | fix punctuation in config templates | Francesco Rodriguez | 2012-08-20 | 7 | -12/+12 | |
| |/ / / / / / | ||||||
| * | | | | | | Make sure :via works with mount | Pratik Naik | 2012-08-20 | 2 | -2/+12 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #7396 from tomykaira/cleanup_test | Rafael Mendonça França | 2012-08-20 | 1 | -11/+11 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Access @rs only through attr_accessor | |||||
| | * | | | | | Access @rs only through attr_accessor | tomykaira | 2012-08-20 | 1 | -11/+11 | |
| |/ / / / / | ||||||
| * | | | | | removes the second argument of the AS const_missing hook | Xavier Noria | 2012-08-19 | 1 | -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 method | Carlos Antonio da Silva | 2012-08-19 | 1 | -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 particular | Xavier Noria | 2012-08-19 | 1 | -2/+0 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #7392 from ernie/real-fix-for-last-equality-wins-in-merge | Rafael Mendonça França | 2012-08-19 | 2 | -14/+12 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix "last equality wins" logic in relation merge | |||||
| | * | | | | | Fix "last equality wins" logic in relation merge | Ernie Miller | 2012-08-19 | 2 | -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 Silva | 2012-08-18 | 3 | -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 association | brainopia | 2012-08-18 | 3 | -1/+11 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #7390 from ↵ | Rafael Mendonça França | 2012-08-18 | 4 | -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 Jones | 2012-08-18 | 4 | -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 Silva | 2012-08-18 | 2 | -76/+104 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | Refactor multiparameter attributes assignment implementation. | |||||
| | * | | | | | Get rid of some arguments by using the accessors | Carlos Antonio da Silva | 2012-08-18 | 1 | -30/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleans up a lot of noise from arguments being passed from one method to another. | |||||
| | * | | | | | Move multiparameter attribute logic to a class | Carlos Antonio da Silva | 2012-08-18 | 1 | -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 docs | Carlos Antonio da Silva | 2012-08-18 | 1 | -3/+7 | |
| | | | | | | | ||||||
| | * | | | | | Use cached column information to instantiate time object | Carlos Antonio da Silva | 2012-08-18 | 1 | -6/+6 | |
| | | | | | | | ||||||
| | * | | | | | Refactor blank date parameter validation | Carlos Antonio da Silva | 2012-08-18 | 1 | -2/+6 | |
| | | | | | | | ||||||
| | * | | | | | Refactor missing parameter validation based on position | Carlos Antonio da Silva | 2012-08-18 | 2 | -8/+12 | |
| | | | | | | | ||||||
| | * | | | | | Reuse already fetched column to check for :time | Carlos Antonio da Silva | 2012-08-18 | 1 | -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 assignment | Carlos Antonio da Silva | 2012-08-18 | 1 | -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 method | Carlos Antonio da Silva | 2012-08-18 | 1 | -3/+6 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #6903 from guilleiguaran/dalli-memcache-store | Santiago Pastorino | 2012-08-17 | 5 | -42/+37 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache::MemCacheStore | |||||
| | * | | | | | Add test to cover increment/decrement of non-existing key in MemCacheStore | Guillermo Iguaran | 2012-08-17 | 1 | -0/+2 | |
| | | | | | | | ||||||
| | * | | | | | Replace deprecated `memcache-client` gem with `dalli` in ↵ | Guillermo Iguaran | 2012-08-17 | 5 | -42/+35 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::Cache::MemCacheStore memcache-client was deprecated in favour of dalli in 2010. | |||||
| * | | | | | Merge pull request #7380 from ↵ | Aaron Patterson | 2012-08-17 | 2 | -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-attribute | Ernie Miller | 2012-08-17 | 2 | -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/master | Rafael Mendonça França | 2012-08-17 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Update to activerecord-deprecated_finders on generator | |||||
| | * | | | | | | Update to activerecord-deprecated_finders on generator | Miguel Herranz | 2012-08-17 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
| * | | | | | | Pull more serialize code into a lazy included module | Jon Leighton | 2012-08-17 | 1 | -60/+63 | |
| | | | | | | | ||||||
| * | | | | | | don't call method unless we need to | Jon Leighton | 2012-08-17 | 1 | -1/+1 | |
| | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |