aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #13557 from gmarik/patch-1Rafael Mendonça França2014-01-012-1/+18
|\ \ \ \
| * | | | add test casegmarik2013-12-311-0/+17
| * | | | Use `Array#wrap` instead `Array()`gmarik2013-12-311-1/+1
* | | | | Removed elipsis indicating that the reader should have more code than what is...Mo Omer2014-01-011-2/+0
* | | | | Make explicit that the view file need to be created [ci skip]Rafael Mendonça França2014-01-011-1/+1
* | | | | Do not highlight rake routes output as ruby code [ci skip]Rafael Mendonça França2014-01-011-2/+2
* | | | | Don't lazy load the tzinfo libraryAndrew White2014-01-012-19/+8
* | | | | Merge pull request #13563 from vipulnsward/2014-is-hereLauro Caetano2014-01-0114-14/+14
|\ \ \ \ \
| * | | | | update copyright notices to 2014. [ci skip]Vipul A M2014-01-0114-14/+14
|/ / / / /
* | | | | Improve the tests to not call assert_nothing_raisedRafael Mendonça França2014-01-011-4/+1
* | | | | Merge pull request #13550 from vipulnsward/13437-fixRafael Mendonça França2014-01-013-1/+22
|\ \ \ \ \
| * | | | | https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5a...Vipul A M2013-12-313-1/+22
* | | | | | Merge pull request #13556 from yahonda/update_mysql_grantRafael Mendonça França2014-01-013-2/+4
|\ \ \ \ \ \
| * | | | | | Change the inexistent database name to inexistent_activerecord_unittestYasuo Honda2014-01-012-2/+2
| * | | | | | Update grant statement to address #13549Yasuo Honda2014-01-011-0/+2
* | | | | | | Merge pull request #13561 from robin850/issue-11723Rafael Mendonça França2014-01-012-2/+10
|\ \ \ \ \ \ \
| * | | | | | | Avoid raising a NameError on FreeBSD using DateRobin Dupret2014-01-012-2/+10
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #13559 from JuanitoFatas/action-controllerRobin Dupret2014-01-011-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ci skip] Add missing flash message in block filter example.Juanito Fatas2014-01-011-2/+5
* | | | | | | Merge pull request #13558 from bcardarella/bc-fix-example-syntaxArun Agrawal2014-01-011-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix comment syntaxBrian Cardarella2013-12-311-1/+1
* | | | | | | Allow engine root relative redirects using an empty string.Andrew White2014-01-013-49/+149
|/ / / / / /
* | | | | | Merge pull request #13419 from amrnt/nullize-enumGodfrey Chan2013-12-313-1/+43
|\ \ \ \ \ \
| * | | | | | Add the ability to nullify the `enum` columnAmr Tamimi2014-01-013-1/+43
|/ / / / / /
* | | | | | Merge remote-tracking branch 'origin/master'Rafael Mendonça França2013-12-3110-42/+232
|\| | | | |
| * | | | | Merge pull request #13470 from strzalek/variants-all-anyDavid Heinemeier Hansson2013-12-315-27/+217
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add any/all support for variantsŁukasz Strzałkowski2013-12-265-27/+217
| * | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-315-15/+15
| |\ \ \ \ \
| | * | | | | Fix few typos and improve markup at some levelsRobin Dupret2013-12-244-5/+5
| | * | | | | [ci skip] trailing documentation whitespaceschneems2013-12-191-10/+10
* | | | | | | Improve tests to use only public APIRafael Mendonça França2013-12-311-3/+2
* | | | | | | Merge pull request #13525 from huoxito/make-outer-joins-on-proper-parentRafael Mendonça França2013-12-312-2/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Make outer joins on proper parentWashington Luiz2013-12-312-2/+12
* | | | | | | Merge pull request #13131 from gja/changed-accepts-valuesGodfrey Chan2013-12-303-2/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Allows you to check if an attribute has changed to a particular valueTejas Dinkar2013-12-153-2/+22
* | | | | | | Merge pull request #13541 from schneems/schneems/db-url-sub-keyRafael Mendonça França2013-12-303-0/+32
|\ \ \ \ \ \ \
| * | | | | | | Allow "url" sub key in database.yml configurationschneems2013-12-303-0/+32
|/ / / / / / /
* | | | | | | Merge pull request #13536 from schneems/schneems/connection-spec-docsRichard Schneeman2013-12-301-14/+80
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] ConnectionSpecification::Resolver Docsschneems2013-12-301-14/+80
* | | | | | | | Merge pull request #13539 from StevenNunez/patch-1Xavier Noria2013-12-301-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update explanation to match exampleSteven Nunez2013-12-301-1/+1
|/ / / / / / / /
* | | | | | | | tidy AR CHANGELOG. [ci skip]Yves Senn2013-12-301-4/+7
* | | | | | | | Merge pull request #13538 from robin850/patch-14Yves Senn2013-12-301-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a missing changelog entry for #13534 [ci skip]Robin Dupret2013-12-301-0/+12
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Remove deprecation warning for FIXTURES_PATHPiotr Sarnacki2013-12-301-6/+0
* | | | | | | | Revert "Install bundle gems to the system not to vendor/bundle"Piotr Sarnacki2013-12-301-1/+0
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #13535 from schneems/schneems/extract-url-logicRafael Mendonça França2013-12-291-34/+79
|\ \ \ \ \ \ \
| * | | | | | | Extract db url connection logic to classschneems2013-12-291-34/+79
| |/ / / / / /
* | | | | | | Merge pull request #13527 from kuldeepaggarwal/f-independent-specsJosé Valim2013-12-293-3/+6
|\ \ \ \ \ \ \
| * | | | | | | used user-defined configurations for running tests that might depend on user'...Kuldeep Aggarwal2013-12-293-3/+6