aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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. Conflicts: activerecord/CHANGELOG.md
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #12159 from nashby/issue-12149Rafael Mendonça França2013-09-122-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | do not break params filtering on nil values
| * | | | | | | do not break params filtering on nil valuesVasiliy Ermolovich2013-09-072-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #12149
* | | | | | | | Use the Rails binary when generating taskRafael Mendonça França2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy-edits [ci skip]
* | | | | | | | 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.
| * | | | | | | | [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 loop
| * | | | | | | | | 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 singular
| * | | | | | | | | | "generates" applies to "collection radio" so it should be singularWaynn Lue2013-09-121-2/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | I accidentally pushed this change to docrails before realizing that it's technically a code change, so I'm opening this pull request (and rolling back my change to docrails).
* / / / / / / / / / Add CHANGELOG entry for #10879Rafael Mendonça França2013-09-121-0/+6
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | 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 clash Conflicts: actionview/CHANGELOG.md
| * | | | | | | | | form_for - fix :namespace and :as options clashAdam Niedzielski2013-09-093-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :as option should not overwrite :namespace option when generating html id attribute of the form element. id should be prefixed by specified namespace even if :as option is present Add test case showing the issue and code fixing it
* | | | | | | | | | Merge pull request #12198 from anupamc/masterRafael Mendonça França2013-09-121-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Removed semicolon and added space
| * | | | | | | | | | 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] Add missing setting locale code snippet.
| * | | | | | | | | | [ci skip] Fix links in section 5.3 of i18n.mdJuanito Fatas2013-09-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now all links point to the correct line number.
| * | | | | | | | | | [ci skip] Add missing setting locale code snippet.Juanito Fatas2013-09-101-0/+11
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for 3 Internationalizing your Application of i18n.md. Missing the code as mentioned in 2.3, setting locale. Without this, the example to add config/locales/pirate.yml will not work.
* | | | | | | | | | Revert "Merge pull request #12208 from mjhoy/patch-1"Rafael Mendonça França2013-09-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ab5cd54b7e791f8419f689d1bef5394890268a6f, reversing changes made to cdc10c898d4865302740340eedec4f5f4ca76565. Reason: This way of defining root path is still supported. See https://github.com/rails/rails/blob/d262773ab7f0aae5de2d354ac2eca168e95b653d/actionpack/test/controller/routing_test.rb#L450-457
* | | | | | | | | | 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` fields
| | * | | | | | | | | | Added quotes when defining the precision for the `decimal` fieldsmogetutu2013-09-121-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: ```bash $ rails generate migration AddDetailsToProducts price:decimal{5,2} supplier:references{polymorphic} ``` after: ```bash $ rails generate migration AddDetailsToProducts 'price:decimal{5,2}' supplier:references{polymorphic} ```
| * | | | | | | | | | Plural of Deer not deerSergio2013-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the plural of Deer word in the naming conventions
| * | | | | | | | | | html generated for a search formSergio2013-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a div that is generated in rails for a default search form and is not includen in the example.
| * | | | | | | | | | Change documentation to consistently refer to the same objectEarl J St Sauver2013-09-081-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation in this section is referring to a profile, so the resource that's created should probably also be a profile of some sort.
| * | | | | | | | | | Blacklist refferenced in docs is actually whitelistEarl J St Sauver2013-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs refference a blacklist, but really what's being described is a whitelist. Anything that matches the constraint gets through to the path.
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The right command for doing that is Client.exists?id:[1,2,3] Exists does not work like find method, in find method you can do Person.find(1, 2, 6) or Person.find([7, 17]) but not Person.exists?(1,2,3) or Person.exists?([1,2,3])
| * | | | | | | | | | Example of Join modelsSergio2013-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the example of join models, there are five models but in the explanation only consider Category, Post, Comment and Guest.
| * | | | | | | | | | `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 docs
| * | | | | | | | | | | 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 method
| * | | | | | | | | | | 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 af9caae
| * | | | | | | | | | | | Enabled quirks mode on JSON.parse, fixes broken test in af9caaeGodfrey Chan2013-09-122-2/+14
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that ActionPack depends on the decoder to parse JSON "fragments" (e.g. '"a string"', '1', 'null', etc), so we need to enable quirks mode on JSON.parse. Also added coverage on the decoder side to prevent regression.
* | | | | | | | | | | | Write the right CHANGELOG entry for #11603Rafael Mendonça França2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge pull request #11603 from ↵Rafael Mendonça França2013-09-123-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/join_strings_instead_of_contactination Cleanup: replace String concatenation by joining for excerpt helper
| * | | | | | | | | | | | Cleanup of excerpt helperPaul Nikitochkin2013-09-063-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * replaced String concatenation by joining * separator has default value to '', even it is nil
* | | | | | | | | | | | | Merge pull request #12206 from harshadsabne/masterRafael Mendonça França2013-09-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | Update 4_0_release_notes.md
| * | | | | | | | | | | | Update 4_0_release_notes.mdHarshad Sabne2013-09-121-3/+3
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Active support --> Deprecations Code highlighted.