aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* converts hashes in arrays of unfiltered params to unpermitted params [fixes #...Xavier Noria2013-12-213-3/+23
* fix url connections for sqlite3Aaron Patterson2013-12-202-1/+34
* Merge pull request #13422 from rwz/masterRafael Mendonça França2013-12-203-4/+4
|\
| * Bump Jbuilder version to 2.0.0Pavel Pravosud2013-12-203-4/+4
|/
* Merge pull request #13415 from schneems/schneems/database-no-usernameYves Senn2013-12-192-4/+18
|\
| * Do not expect database user with app name to existschneems2013-12-192-4/+18
* | Fix AS::NumberHelper results with large precisionsKenta Murata & Akira Matsuda2013-12-203-7/+62
* | Merge pull request #13188 from imanel/skip_deep_mungeJeremy Kemper2013-12-194-0/+33
|\ \
| * | Add configuration option to optionally disable deep_mungeBernard Potocki2013-12-054-0/+35
* | | Merge pull request #13418 from ma2gedev/update_sass_rails_4_0_0Guillermo Iguaran2013-12-191-1/+1
|\ \ \
| * | | Use sass-rails 4.0.1Takayuki Matsubara2013-12-201-1/+1
|/ / /
* | | Merge pull request #13417 from TalkativeTree/comments_changeRichard Schneeman2013-12-191-1/+1
|\ \ \
| * | | change CollectionAssociation's comments to say Association instead of Associa...Ben Angel2013-12-191-1/+1
* | | | Merge pull request #13326 from schneems/schneems/add-asset-flagGuillermo Iguaran2013-12-192-0/+32
|\ \ \ \
| * | | | Flag `config.assets.raise_runtime_errors` in devschneems2013-12-192-0/+32
* | | | | Merge pull request #13357 from taryneast/masterLauro Caetano2013-12-191-4/+4
|\ \ \ \ \
| * | | | | [ci skip] Describe precision + scale in migrationsTaryn East2013-12-201-4/+4
* | | | | | Merge pull request #13412 from arthurnn/quote_id_not_idRafael Mendonça França2013-12-192-1/+10
|\ \ \ \ \ \
| * | | | | | quoting: Check if id is a valid method before using itArthur Neves2013-12-192-1/+10
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #13411 from schneems/schneems/runner-command-dash-cRafael Mendonça França2013-12-191-5/+14
|\ \ \ \ \ \
| * | | | | | Make `rails runner` command options more obviousschneems2013-12-191-5/+14
* | | | | | | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-12-191-8/+6
* | | | | | | Merge pull request #13344 from ccutrer/fix-from-default-selectRafael Mendonça França2013-12-193-1/+26
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix default select when from is usedCody Cutrer2013-12-193-1/+26
|/ / / / / /
* / / / / / Fix indent in PG array testsCarlos Antonio da Silva2013-12-191-5/+5
|/ / / / /
* | | | | Make sure multiline string is not accepted by the regexpRafael Mendonça França2013-12-192-2/+10
* | | | | Make possible to use symbol as the verifier nameRafael Mendonça França2013-12-194-11/+10
* | | | | Change the message verifier argument to verifier_nameRafael Mendonça França2013-12-192-8/+8
* | | | | revises the release notes about message verifiers (second take) [ci skip]Xavier Noria2013-12-191-8/+11
* | | | | Revert "revises the release notes about message verifiers [ci skip]"Xavier Noria2013-12-192-12/+9
* | | | | revises the release notes about message verifiers [ci skip]Xavier Noria2013-12-192-9/+12
* | | | | Merge pull request #13408 from JuanitoFatas/remove-ttRafael Mendonça França2013-12-191-2/+2
|\ \ \ \ \
| * | | | | Remove <tt> tag in 4_1_release notes. [ci skip].Juanito Fatas2013-12-201-2/+2
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-2021-28/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert "Update contributing_to_ruby_on_rails.md"Vijay Dev2013-12-191-1/+1
| * | | | | Revert "Update security.md"Vijay Dev2013-12-191-1/+1
| * | | | | Revert "Fix on-site markdown rendering [ci skip]"Vijay Dev2013-12-191-1/+1
| * | | | | Revert "Underscore in markdown should be escaped with backslash [ci skip]"Vijay Dev2013-12-191-1/+1
| * | | | | [ci skip] add `assets.raise_runtime_errors` flagschneems2013-12-141-2/+4
| * | | | | Merge branch 'master' of github.com:rails/docrailsKuldeep Aggarwal2013-12-101-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-12-10588-6771/+10534
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-09-01301-2671/+3921
| | |\ \ \ \ \ \
| | * | | | | | | fixed a typoaditya-kapoor2013-08-201-1/+1
| * | | | | | | | fixed typo mistake time_formats.rb -> date_formats.rb [ci skip]Kuldeep Aggarwal2013-12-101-1/+1
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Remove an extra periodRobin Dupret2013-12-041-1/+1
| * | | | | | | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-0316-23/+23
| * | | | | | | Update contributing_to_ruby_on_rails.mdHarshad Sabne2013-12-011-1/+1
| * | | | | | | Update security.mdHarshad Sabne2013-11-301-1/+1
| * | | | | | | Remove Rdoc formatting from markdown [ci skip]Harshad Sabne2013-11-291-1/+1
| * | | | | | | Fix on-site markdown rendering [ci skip]Harshad Sabne2013-11-281-1/+1