aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated guides with latest method [ci skip]Rashmi Yadav2013-09-131-2/+2
* Updated the file path [ci skip]Rashmi Yadav2013-09-131-4/+4
* Updated with latest method [ci skip]Rashmi Yadav2013-09-131-4/+5
* Revert ""generates" applies to "collection radio" so it should be singular"Rafael Mendonça França2013-09-121-2/+2
* take out reference to previous versions of RailsWaynn Lue2013-09-121-3/+1
* "generates" applies to "collection radio" so it should be singularWaynn Lue2013-09-121-2/+2
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-1311-129/+293
|\
| * Wrap the guides in 80 columns [ci skip]Rafael Mendonça França2013-09-121-101/+260
| * Merge pull request #163 from mogetutu/masterRafael Mendonça França2013-09-121-1/+1
| |\
| | * Added quotes when defining the precision for the `decimal` fieldsmogetutu2013-09-121-1/+1
| |/
| * Plural of Deer not deerSergio2013-09-101-1/+1
| * html generated for a search formSergio2013-09-091-1/+1
| * Change documentation to consistently refer to the same objectEarl J St Sauver2013-09-081-8/+8
| * Blacklist refferenced in docs is actually whitelistEarl J St Sauver2013-09-081-2/+2
| * added # or commentSergio2013-09-051-1/+1
| * Review the changes made on 90155b4e28a3887dce9428e9df150ede3d6c7465Rafael Mendonça França2013-09-041-5/+9
| * Client.exists?(1,2,3) and Client.exists?([1,2,3]) does not workSergio2013-09-051-3/+3
| * Example of Join modelsSergio2013-09-041-1/+1
| * `implemention` => `implementation`Vipul A M2013-09-031-1/+1
| * `attibutes` => `attributes`Vipul A M2013-09-031-1/+1
| * Be assertive about adding `[ci skip]` messageVipul A M2013-09-031-1/+1
| * 4.0 Release notes should point to 4.0 ChangelogVipul A M2013-09-031-6/+6
| * Fix spacing issueVipul A M2013-09-031-0/+1
* | Merge pull request #12208 from mjhoy/patch-1Rafael Mendonça França2013-09-121-4/+0
|\ \
| * | remove outdated docsMichael Hoy2013-09-121-4/+0
|/ /
* | Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanupRafael Mendonça França2013-09-123-1/+18
|\ \
| * | Fix FileStore#cleanup to no longer rely on missing each_key methodMurray Steele2013-09-113-1/+18
* | | Merge pull request #12207 from chancancode/fix_json_loadRafael Mendonça França2013-09-122-2/+14
|\ \ \
| * | | Enabled quirks mode on JSON.parse, fixes broken test in af9caaeGodfrey Chan2013-09-122-2/+14
|/ / /
* | | Write the right CHANGELOG entry for #11603Rafael Mendonça França2013-09-121-1/+1
* | | Merge pull request #11603 from jetthoughts/join_strings_instead_of_contactina...Rafael Mendonça França2013-09-123-2/+10
|\ \ \
| * | | Cleanup of excerpt helperPaul Nikitochkin2013-09-063-2/+10
* | | | Merge pull request #12206 from harshadsabne/masterRafael Mendonça França2013-09-121-3/+3
|\ \ \ \
| * | | | Update 4_0_release_notes.mdHarshad Sabne2013-09-121-3/+3
|/ / / /
* | | | Disable prepared statements in the unprepared_statement blockRafael Mendonça França2013-09-121-2/+3
* | | | Fix typo on instance variable get callCarlos Antonio da Silva2013-09-121-1/+1
* | | | Merge pull request #12205 from claudiob/remove-unused-raw-email-fixturesCarlos Antonio da Silva2013-09-1215-736/+0
|\ \ \ \
| * | | | Remove unused raw email fixturesclaudiob2013-09-1215-736/+0
|/ / / /
* | | | Merge pull request #12201 from chancancode/json_loadJeremy Kemper2013-09-112-3/+16
|\ \ \ \
| * | | | Replace JSON.load with JSON.parse, also removed the proc parameterGodfrey Chan2013-09-112-3/+16
* | | | | these are not real developer objects, so counting them doesn't makeAaron Patterson2013-09-111-1/+1
* | | | | Remove conditional adding a new methodRafael Mendonça França2013-09-112-6/+6
* | | | | Fix inverted conditionalRafael Mendonça França2013-09-111-1/+1
* | | | | Remove invalid commentRafael Mendonça França2013-09-111-4/+0
* | | | | Check if the SQL is not a prepared statementRafael Mendonça França2013-09-1110-7/+29
|/ / / /
* | | | Merge pull request #12188 from SamSaffron/masterAaron Patterson2013-09-114-12/+16
|\ \ \ \
| * | | | Perf: avoid dupes add fallback logic for codersSam2013-09-114-12/+16
* | | | | Merge pull request #12200 from dchelimsky/simplify-duration-inspect-even-moreRafael Mendonça França2013-09-112-6/+7
|\ \ \ \ \
| * | | | | Reduce Duration#inspect to a single series of transformationsDavid Chelimsky2013-09-112-6/+7
* | | | | | Merge pull request #12135 from dylanahsmith/avoid_empty_transactionRafael Mendonça França2013-09-113-1/+10
|\ \ \ \ \ \