aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15101 from tgxworld/improve_performance_of_building_uriAndrew White2014-05-223-13/+16
|\
| * Form full URI as string to be parsed in Rack::Test.Guo Xiang Tan2014-05-213-13/+16
|/
* Merge pull request #14803 from kuldeepaggarwal/null_relation_sum_fixMatthew Draper2014-05-223-3/+66
|\
| * Fixed a problem where `sum`, `size`, `average`, `minimum` and `maximum` usedKuldeep Aggarwal2014-05-153-3/+66
* | Update CHANGELOG.mdGuillermo Iguaran2014-05-211-4/+4
* | Merge pull request #15215 from JohnKellyFerguson/rename-posts-to-articlesGuillermo Iguaran2014-05-2120-655/+658
|\ \
| * | Rename Posts to Articles in Guides, continuation of 2d446e77 / #13774 [ci skip]John Kelly Ferguson2014-05-2120-655/+658
|/ /
* | Merge pull request #15237 from sgrif/sg-move-extract-scaleRafael Mendonça França2014-05-214-8/+7
|\ \
| * | Move extract_scale to decimal typeSean Griffin2014-05-214-8/+7
* | | Merge pull request #15218 from sgrif/sg-move-oid-typesRafael Mendonça França2014-05-2123-353/+532
|\ \ \
| * | | Move PG OID types to their own filesSean Griffin2014-05-2123-353/+532
* | | | drop hash allocations during matchAaron Patterson2014-05-211-2/+2
* | | | fewer object allocations and method calls during route matchAaron Patterson2014-05-211-5/+5
* | | | middle variable is never used, so rmAaron Patterson2014-05-213-16/+16
* | | | use the existing constant rather than the hardcoded stringAaron Patterson2014-05-211-3/+3
* | | | remove dead code. @klass isn't used anymoreAaron Patterson2014-05-211-1/+0
* | | | we can just use Ruby hereAaron Patterson2014-05-211-2/+2
* | | | reuse path formatter from the non-optimized path.Aaron Patterson2014-05-213-39/+3
* | | | reduce object allocationsAaron Patterson2014-05-211-2/+4
* | | | make variable name more clearAaron Patterson2014-05-211-2/+2
* | | | do not mutate parameters, let the caller do mutationsAaron Patterson2014-05-212-4/+6
* | | | push the formatter up to the Route objectAaron Patterson2014-05-212-4/+4
* | | | Merge pull request #15231 from khusnetdinov/fix_typo_guides_active_support_in...Guillermo Iguaran2014-05-211-1/+1
|\ \ \ \
| * | | | Fix typo guides/source/active_support_instrumentation.mdMarat Khusnetdinov2014-05-221-1/+1
* | | | | Merge pull request #15229 from peeyushsingla/masterRafael Mendonça França2014-05-211-2/+2
|\ \ \ \ \
| * | | | | fixes in active record query for reorderpeeyush2014-05-211-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #15227 from sgrif/sg-rename-oid-typeRafael Mendonça França2014-05-212-15/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename `oid_type` to `cast_type` to make PG columns consistentSean Griffin2014-05-212-15/+5
|/ / / /
* | | | Merge pull request #15219 from sgrif/sg-missing-nodocRafael Mendonça França2014-05-211-3/+3
|\ \ \ \
| * | | | Add missing nodocs to MySQL adapterSean Griffin2014-05-211-3/+3
| | |/ / | |/| |
* | | | Merge pull request #14613 from Sirupsen/fix-serialize-update-columnRafael Mendonça França2014-05-214-14/+51
|\ \ \ \
| * | | | Fix serialized field returning serialized data after update_columnSimon Eskildsen2014-04-054-14/+51
* | | | | Revert "Merge pull request #14544 from jefflai2/named_scope_sti"Rafael Mendonça França2014-05-218-42/+5
* | | | | 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