aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11698 from dmathieu/sqlite_tasks_without_railsRafael Mendonça França2013-09-123-2/+4
|\
| * let the sqlite task run without railsDamien Mathieu2013-08-073-2/+4
* | Merge pull request #12156 from rywall/from-copy-bindsRafael Mendonça França2013-09-123-0/+12
|\ \
| * | Allow Relation#from to accept other relations with bind values.Ryan Wallace2013-09-083-0/+12
* | | Add CHANGELOG entry for #12149Rafael Mendonça França2013-09-121-0/+6
* | | Merge pull request #12159 from nashby/issue-12149Rafael Mendonça França2013-09-122-1/+10
|\ \ \
| * | | do not break params filtering on nil valuesVasiliy Ermolovich2013-09-072-1/+10
* | | | Use the Rails binary when generating taskRafael Mendonça França2013-09-121-2/+2
* | | | Merge pull request #12170 from siong1987/taskRafael Mendonça França2013-09-121-1/+3
|\ \ \ \
| * | | | [ci skip] Documentation on how to create custom rake tasks.Teng Siong Ong2013-09-101-1/+3
* | | | | Merge pull request #12210 from vipulnsward/remove_extra_loopRafael Mendonça França2013-09-121-5/+2
|\ \ \ \ \
| * | | | | Remove unnecessary loopVipul A M2013-09-131-5/+2
* | | | | | Merge pull request #12209 from waynn/patch-4Rafael Mendonça França2013-09-121-2/+2
|\ \ \ \ \ \
| * | | | | | "generates" applies to "collection radio" so it should be singularWaynn Lue2013-09-121-2/+2
|/ / / / / /
* / / / / / Add CHANGELOG entry for #10879Rafael Mendonça França2013-09-121-0/+6
|/ / / / /
* | | | | Merge pull request #12112 from adamniedzielski/fix-form-for-namespace-and-asRafael Mendonça França2013-09-123-1/+21
|\ \ \ \ \
| * | | | | form_for - fix :namespace and :as options clashAdam Niedzielski2013-09-093-1/+21
* | | | | | Merge pull request #12198 from anupamc/masterRafael Mendonça França2013-09-121-2/+2
|\ \ \ \ \ \
| * | | | | | Removed semicolon and added spaceAnupam Choudhury2013-09-131-2/+2
|/ / / / / /
* | | | | | Merge pull request #12175 from JuanitoFatas/doc-patchRafael Mendonça França2013-09-121-5/+16
|\ \ \ \ \ \
| * | | | | | [ci skip] Fix links in section 5.3 of i18n.mdJuanito Fatas2013-09-101-5/+5
| * | | | | | [ci skip] Add missing setting locale code snippet.Juanito Fatas2013-09-101-0/+11
| | |/ / / / | |/| | | |
* | | | | | Revert "Merge pull request #12208 from mjhoy/patch-1"Rafael Mendonça França2013-09-121-0/+4
* | | | | | 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
|\ \ \ \ \ \ \ \ \