aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #15221 from laurelfan/doc-fix-redirectingArthur Nogueira Neves2014-05-211-4/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | fix formatting and text for ActionController::Redirecting docLaurel Fan2014-05-211-4/+8
* | | | | | | | | build fix, use lambda syntax that ruby 1.9.3 understands.Yves Senn2014-05-211-1/+1
* | | | | | | | | push `extract_scale` to the `Type`.Yves Senn2014-05-214-7/+9
* | | | | | | | | pg, extract money tests into separate file.Yves Senn2014-05-212-35/+55
* | | | | | | | | Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_keyYves Senn2014-05-215-4/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix polymorphic eager load with foreign_key as String.Lauro Caetano2014-05-205-2/+42
|/ / / / / / / / /
* | | | | | | | | Merge pull request #15213 from tgxworld/remove_redundant_codeRafael Mendonça França2014-05-201-3/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove redundant code.Guo Xiang Tan2014-05-201-3/+2
* | | | | | | | | | Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_arraysRafael Mendonça França2014-05-203-16/+67
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Hash#deep_*_keys(!) recurse into nested arrays.OZAWA Sakuro2013-06-083-16/+67
* | | | | | | | | | Merge pull request #14544 from jefflai2/named_scope_stiRafael Mendonça França2014-05-208-5/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixes Issue #13466.Jefferson Lai2014-04-238-5/+42
* | | | | | | | | | | Merge pull request #15205 from sgrif/sg-delegate-klassRafael Mendonça França2014-05-209-14/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Delegate `klass` to the injected type objectSean Griffin2014-05-209-14/+33
* | | | | | | | | | | | Merge pull request #14979 from brocktimus/masterRafael Mendonça França2014-05-203-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Prevented belongs_to: touch propagating up if there are no changes being savedBrock Trappitt2014-05-213-1/+16
* | | | | | | | | | | | | Revert "Revert "Merge pull request #8313 from alan/only_save_changed_has_one_...Rafael Mendonça França2014-05-203-8/+22
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #15154 from msgehard/move_password_fieldRafael Mendonça França2014-05-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Put attr_reader in with all of the other instance methodsMike Gehard2014-05-171-2/+2
* | | | | | | | | | | | | we don't use this parameter for anything, so rmAaron Patterson2014-05-203-22/+21
* | | | | | | | | | | | | fewer string allocations per url_forAaron Patterson2014-05-201-7/+5
* | | | | | | | | | | | | mutate the path string to avoid object allocationsAaron Patterson2014-05-201-4/+4
* | | | | | | | | | | | | push only_path conditional upAaron Patterson2014-05-201-18/+19
* | | | | | | | | | | | | push arg checking upAaron Patterson2014-05-201-4/+4
* | | | | | | | | | | | | fewer method calls and string garbage when there is no user/passwordAaron Patterson2014-05-201-9/+5
* | | | | | | | | | | | | fewer hash allocations when calling url_forAaron Patterson2014-05-201-9/+12
* | | | | | | | | | | | | fix variable names, only pass hashes to the positional args methodAaron Patterson2014-05-201-8/+10
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #15208 from sgrif/sg-delegate-type-cast-for-writeRafael Mendonça França2014-05-204-30/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Delegate `type_cast_for_write` to injected type objectSean Griffin2014-05-204-30/+14
* | | | | | | | | | | | | Merge pull request #11346 from tomykaira/fix_10257Rafael Mendonça França2014-05-202-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Run login_procedure only when the auth_scheme is validtomykaira2013-07-081-7/+14
| * | | | | | | | | | | | Check authentication scheme in Basic authtomykaira2013-07-072-1/+13
* | | | | | | | | | | | | Merge pull request #15207 from sgrif/sg-inline-column-helpersRafael Mendonça França2014-05-2010-120/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Inline typecasting helpers from Column to the appropriate typesSean Griffin2014-05-2010-120/+77
* | | | | | | | | | | | | | Merge pull request #15206 from sgrif/sg-type-map-postgresqlRafael Mendonça França2014-05-203-45/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use the generic type map for PostgreSQL OID registrationsSean Griffin2014-05-203-45/+31
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #15204 from sgrif/sg-delegate-predicatesRafael Mendonça França2014-05-2012-24/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Delegate predicate methods to injected type object on ColumnSean Griffin2014-05-2012-24/+44
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | remove dead codeAaron Patterson2014-05-201-57/+0
* | | | | | | | | | | | | cache the formatter on the path objectAaron Patterson2014-05-202-2/+6
* | | | | | | | | | | | | translate AST to a formatter before url generationAaron Patterson2014-05-202-1/+72
* | | | | | | | | | | | | Merge pull request #15200 from sgrif/sg-type-map-mysqlRafael Mendonça França2014-05-204-23/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use the generic type map object for mysql field lookupsSean Griffin2014-05-204-23/+39
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #15191 from camsong/masterYves Senn2014-05-201-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Distinguish rake assets:clobber from rake assets:cleancam song2014-05-201-2/+5
* | | | | | | | | | | | | | Merge pull request #15203 from sgrif/sg-delegate-type-castRafael Mendonça França2014-05-207-75/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Replace `type_cast` case statement with delegationSean Griffin2014-05-207-75/+7
* | | | | | | | | | | | | | | Merge pull request #15187 from v-yarotsky/fix_confusing_delegation_exceptionRafael Mendonça França2014-05-203-26/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix confusing exception in ActiveSupport delegationVladimir Yarotsky2014-05-203-26/+20