aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into loofahRafael Mendonça França2014-08-12415-3045/+5699
|\
| * :bomb:Rafael Mendonça França2014-08-121-1/+1
| * Merge pull request #16476 from akshay-vishnoi/doc-changesRafael Mendonça França2014-08-122-2/+2
| |\
| | * use 'based on' instead of 'based off' [ci skip]Akshay Vishnoi2014-08-122-2/+2
| * | Nobody sucks so nobody should call this awful method nameRafael Mendonça França2014-08-129-8/+12
| |/
| * CHANGELOG entry for TestCase.i_suck_and_my_tests_are_order_dependent! fixAkira Matsuda2014-08-121-0/+6
| * Remove old setup from AS test caseCarlos Antonio da Silva2014-08-121-5/+0
| * users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent!Akira Matsuda2014-08-128-4/+34
| * Merge pull request #16472 from y-yagi/patch-1Carlos Antonio da Silva2014-08-121-1/+1
| |\
| | * [ci skip] Fix broken url in plugins guideyuuji.yaginuma2014-08-121-1/+1
| |/
| * Merge pull request #16456 from lsylvester/improve-active-record-error-message...Santiago Pastorino2014-08-112-1/+8
| |\
| | * update error message to reflect that the record could have been destroyedlsylvester2014-08-112-1/+8
| |/
| * Merge pull request #16300 from vast/mention-changes-to-nil-serialization-in-u...Godfrey Chan2014-08-101-1/+5
| |\
| | * [ci skip] Clarify the "Serialized Attributes" sectionVasily Polovnyov2014-07-261-1/+2
| | * [ci skip] Mention the change in nil handling for serialized attributesVasily Polovnyov2014-07-261-0/+3
| * | Merge pull request #16453 from reshleman/re-cleanup-guides-guidelinesZachary Scott2014-08-101-12/+10
| |\ \
| | * | Cleanup Guides Guidelines [ci skip]Robert Eshleman2014-08-101-12/+10
| |/ /
| * | Merge pull request #16451 from y-yagi/patch-2Zachary Scott2014-08-101-2/+2
| |\ \
| | * | [ci skip] Fix sample code in engines guideyuuji.yaginuma2014-08-101-2/+2
| |/ /
| * | Merge pull request #16441 from tomkadwill/activerecord_associations_options_p...Santiago Pastorino2014-08-091-4/+4
| |\ \
| | * | [ci skip] Changed options to +options+ for rdocTom Kadwill2014-08-091-4/+4
| * | | Merge pull request #16440 from tgxworld/pass_log_in_blockSantiago Pastorino2014-08-091-4/+6
| |\ \ \
| | * | | Pass block for logging.Guo Xiang Tan2014-08-091-4/+6
| * | | | Merge pull request #16439 from voxxit/patch-1Santiago Pastorino2014-08-091-1/+1
| |\ \ \ \
| | * | | | Using delegated connection methodJoshua Delsman2014-08-081-1/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #16443 from duccioarmenise/patch-1Vijay Dev2014-08-091-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update README.mdDuccio Armenise2014-08-091-1/+1
| |/ / /
| * | | Merge pull request #16437 from mscoutermarsh/masterRichard Schneeman2014-08-081-1/+1
| |\ \ \
| | * | | Docs: grammar fix for fetch. [ci skip]Mike Coutermarsh2014-08-081-1/+1
| |/ / /
| * | | Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"Santiago Pastorino2014-08-085-38/+3
| * | | Merge pull request #16434 from strzalek/cookies-digest-config-optionSantiago Pastorino2014-08-085-3/+38
| |\ \ \
| | * | | Return preconfigured AS::MessageVerifierŁukasz Strzałkowski2014-08-082-1/+7
| | * | | Add config option for cookies digestŁukasz Strzałkowski2014-08-084-2/+31
| * | | | save a hash allocation per request.Aaron Patterson2014-08-081-1/+1
| * | | | add a test for prepending SCRIPT_NAME to generated urlsAaron Patterson2014-08-081-0/+88
| * | | | Merge pull request #16429 from arunagw/aa-build-fix-gemfile-springSantiago Pastorino2014-08-083-8/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fixes test for Gemfile entry changesArun Agrawal2014-08-083-8/+13
| | |/ /
| * | | Merge pull request #16427 from ryandao/full_stack_source_extractGuillermo Iguaran2014-08-089-69/+114
| |\ \ \
| | * | | Update actionpack CHANGELOGRyan Dao2014-08-081-0/+5
| | * | | Retrieve source code for the entire stack traceRyan Dao2014-08-088-69/+109
| | |/ /
| * | | Merge pull request #16426 from tgxworld/fix_false_positiveSantiago Pastorino2014-08-081-4/+5
| |\ \ \
| | * | | Fixes to TestCaseTest.Guo Xiang Tan2014-08-081-4/+5
| | |/ /
| * | | Fix the #const_regexp's documentation [ci skip]Robin Dupret2014-08-081-3/+4
| * | | Merge pull request #16430 from guillermo/patch-1Rafael Mendonça França2014-08-081-1/+1
| |\ \ \
| | * | | Fix typo in plugins docGuillermo Álvarez Fernández2014-08-081-1/+1
| |/ / /
| * | | Merge pull request #16428 from tomkadwill/activerecord_associations_name_paramCarlos Antonio da Silva2014-08-081-4/+4
| |\ \ \ | | |/ / | |/| |
| | * | [ci skip] Changed 'first argument' to '+name+ argument'Tom Kadwill2014-08-081-4/+4
| |/ /
| * | Rephrase how we explain RecordInvalid exception in the context ofZachary Scott2014-08-071-3/+5
| * | Merge pull request #16384 from tomkadwill/improved_create_documentationZachary Scott2014-08-071-2/+5
| |\ \
| | * | [ci skip] Updated create! documentation description and added +attributes+ fo...Tom Kadwill2014-08-071-2/+5