aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13457 from strzalek/add-missing-av-railtieJosé Valim2013-12-231-0/+1
|\
| * Add missing av/railtie requireŁukasz Strzałkowski2013-12-221-0/+1
|/
* CHANGELOG entry for #13451. [ci skip]Yves Senn2013-12-221-0/+13
* Merge pull request #13451 from dmathieu/quoting_non_stringsYves Senn2013-12-222-1/+7
|\
| * fix quoting non-stringsDamien Mathieu2013-12-222-1/+7
|/
* Use the same enum definition in the docs and in the comments [ci skip]Godfrey Chan2013-12-221-6/+6
* Add comments with urls for email previewsAndrew White2013-12-222-6/+13
* Merge pull request #13443 from schneems/schneems/fix-master-testsGuillermo Iguaran2013-12-213-24/+26
|\
| * Use Full path to sqlite database in testsschneems2013-12-222-4/+4
| * Fix DB Console tests schneems2013-12-211-20/+22
|/
* Merge pull request #13438 from vipulnsward/enable-memache-on-travisGuillermo Iguaran2013-12-211-0/+3
|\
| * Enable memcached service on travis for running cache tests.Vipul A M2013-12-221-0/+3
* | Merge pull request #13436 from robin850/patch-11Guillermo Iguaran2013-12-214-2/+18
|\ \
| * | Fix few typos in the documentation [ci skip]Robin Dupret2013-12-212-2/+2
| * | Add a changelog entry for #13326 [ci skip]Robin Dupret2013-12-211-0/+8
| * | Add a changelog entry for #13363 [ci skip]Robin Dupret2013-12-211-0/+8
* | | Fix typo [ci skip]Carlos Antonio da Silva2013-12-211-1/+1
* | | optimizes array conversion in AC::ParametersXavier Noria2013-12-212-2/+17
|/ /
* | refactors AC::Parameters#fetchXavier Noria2013-12-211-10/+3
* | Test with 2.1.0-rc1Guillermo Iguaran2013-12-201-1/+1
* | Merge pull request #13425 from kassio/masterDavid Heinemeier Hansson2013-12-207-8/+39
|\ \
| * | `html` and `text` templates for mailers by defaultKassio Borges2013-12-207-8/+39
* | | 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