aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12228 from ersatzryan/standardize-json-time-formatsAndrew White2013-11-075-7/+12
|\
| * Standardize all JSON encoded times to use 3 decimal fractional secondsRyan Glover2013-11-075-7/+12
|/
* AestheticsRafael Mendonça França2013-11-071-13/+13
* Merge pull request #12787 from notalex/extract_methodRafael Mendonça França2013-11-071-23/+34
|\
| * Move interrupt information to print_boot_information methodAlex Johnson2013-11-071-4/+1
| * Extract method refactoring for Rails::Server#startAlex Johnson2013-11-071-24/+38
* | Merge pull request #12771 from bogdan/patch-1Yves Senn2013-11-071-4/+4
|\ \
| * | Fix AS::TimeWithZone#as_json docsBogdan Gusiev2013-11-071-4/+4
* | | only ask for these ivars if the target responds to themAaron Patterson2013-11-061-3/+3
* | | Merge pull request #12792 from chancancode/move_json_requiresRafael Mendonça França2013-11-062-8/+7
|\ \ \
| * | | Move the JSON extension require statements to the right place.Godfrey Chan2013-11-062-8/+7
|/ / /
* | | Merge pull request #12785 from chancancode/do_not_leak_internal_stateJeremy Kemper2013-11-065-58/+45
|\ \ \
| * | | Do not expose internal state in the public encoder API (i.e. as_json)Godfrey Chan2013-11-064-55/+42
| * | | Moved AS::JSON::DATE_REGEX as it's only used for decodingGodfrey Chan2013-11-062-3/+3
|/ / /
* | | Stop using method missing for singleton delegation.Aaron Patterson2013-11-065-9/+15
* | | drop one more string allocationAaron Patterson2013-11-061-1/+1
* | | drop string allocations in the log subscriberAaron Patterson2013-11-061-2/+12
* | | calculate the ivars to remove in advance as a set and cache them in aAaron Patterson2013-11-063-12/+17
* | | use a set and reject to avoid array allocationsAaron Patterson2013-11-061-4/+11
* | | each_with_object on the view_assigns hashAaron Patterson2013-11-061-3/+1
* | | use slice to avoid range allocationAaron Patterson2013-11-061-1/+3
* | | these variables are also privateAaron Patterson2013-11-061-0/+1
* | | instance_variables returns symbols, so we should use symbols in our listAaron Patterson2013-11-061-1/+1
| |/ |/|
* | Merge pull request #12789 from claudiob/humanize-without-capitalizingXavier Noria2013-11-067-15/+58
|\ \
| * | Add +capitalize+ option to Inflector.humanizeclaudiob2013-11-067-15/+58
|/ /
* | Merge pull request #12788 from kylefritz/patch-1Rafael Mendonça França2013-11-061-2/+2
* | Merge pull request #12783 from chancancode/eliminate_direct_json_gem_useJeremy Kemper2013-11-068-31/+32
|\ \
| * | Eliminate `JSON.{parse,load,generate,dump}` and `def to_json`Godfrey Chan2013-11-058-31/+32
* | | bring back constant to expose the enum mapping as HWIA.Yves Senn2013-11-062-4/+19
* | | update the AR enum docs to match the actual behavior. [ci skip]Yves Senn2013-11-061-5/+3
|/ /
* | Fix AS changelog indent, remove tabs and extra spaces [ci skip]Carlos Antonio da Silva2013-11-061-2/+2
* | Merge pull request #12782 from chancancode/fix_object_and_struct_as_jsonJeremy Kemper2013-11-053-5/+40
|\ \
| * | Fixed Object#as_json and Struct#as_json with optionsGodfrey Chan2013-11-053-5/+40
|/ /
* | store enum mapping using `Strings` instead of `Symbols`.Yves Senn2013-11-052-3/+9
* | direct enum assignment rasies ArgumentError for unknown values.Yves Senn2013-11-052-1/+18
* | Merge pull request #12776 from derekprior/dp-i18n-doc-fixRafael Mendonça França2013-11-051-1/+1
|\ \
| * | Clarify HTML Safe Translations [ci-skip]Derek Prior2013-11-051-1/+1
* | | define enum methods inside a `Module` to make them overwritable.Yves Senn2013-11-053-13/+34
* | | Merge pull request #12390 from kennyj/rename_to_association_methodsRafael Mendonça França2013-11-054-7/+7
|\ \ \
| * | | Renamed generated_feature_methods to generated_association_methods.kennyj2013-09-285-12/+12
* | | | Remove private API testRafael Mendonça França2013-11-051-10/+0
| |/ / |/| |
* | | Merge pull request #12773 from ptn/use_19_syntax_in_schema_testGuillermo Iguaran2013-11-051-1/+1
|\ \ \
| * | | Use 1.9 Hash syntax consistentlyPablo Torres2013-11-051-1/+1
|/ / /
* | | Merge pull request #12752 from notalex/expand_path_refactoringYves Senn2013-11-053-3/+3
|\ \ \ | |_|/ |/| |
| * | Refactor File.expand_path usage to remove additional File.joinAlex Johnson2013-11-053-3/+3
* | | ask the fixture set for the sql statementsAaron Patterson2013-11-042-11/+17
* | | The enum value constant isn't used, so rm it for now.Aaron Patterson2013-11-042-27/+7
* | | stop doing the same calculation over and overAaron Patterson2013-11-041-4/+5
* | | oops, template replay needs to happen after bundle. :orz:Aaron Patterson2013-11-041-1/+1
* | | application template respects Gemfile entriesAaron Patterson2013-11-042-0/+25