Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | 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. | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
* | | | | | | | | 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 | |
* | | | | | | | | 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 | 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 | 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 | |
* | | | | | | | Remove private verify readonly attr method | Carlos Antonio da Silva | 2012-08-19 | 1 | -5/+1 | |
* | | | | | | | 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 | Ernie Miller | 2012-08-19 | 2 | -14/+12 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #7377 from brainopia/use_inversed_parent_for_first_and_las... | Carlos Antonio da Silva | 2012-08-18 | 3 | -1/+11 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use inversed parent for first and last child of has_many association | brainopia | 2012-08-18 | 3 | -1/+11 | |
* | | | | | | | | Merge pull request #7390 from aantix/add_x_content_type_options_to_default_he... | Rafael Mendonça França | 2012-08-18 | 4 | -5/+9 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | Added X-Content-Type-Options to the header defaults. | Jim Jones | 2012-08-18 | 4 | -5/+9 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'multiparameter-attributes-refactor' | Carlos Antonio da Silva | 2012-08-18 | 2 | -76/+104 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Get rid of some arguments by using the accessors | Carlos Antonio da Silva | 2012-08-18 | 1 | -30/+31 | |
| * | | | | | | Move multiparameter attribute logic to a class | Carlos Antonio da Silva | 2012-08-18 | 1 | -72/+84 | |
| * | | | | | | 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 | |
| * | | | | | | Refactor some code in multiparameter assignment | Carlos Antonio da Silva | 2012-08-18 | 1 | -26/+25 | |
| * | | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 ActiveSupport::Cache... | Guillermo Iguaran | 2012-08-17 | 5 | -42/+35 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #7380 from ernie/fix-nomethoderror-on-non-attribute-equali... | Aaron Patterson | 2012-08-17 | 2 | -2/+21 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix merge error when Equality LHS is non-attribute | Ernie Miller | 2012-08-17 | 2 | -2/+21 | |
* | | | | | | | 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 | 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 | |
* | | | | | | | align them assignments | Jon Leighton | 2012-08-17 | 1 | -4/+4 |