aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Building new records with enum scopes now works as expectedGodfrey Chan2014-01-033-12/+15
* Deprecate unused `symbolized_base_class` and `symbolized_sti_name`.Yves Senn2014-01-033-0/+10
* Merge pull request #13578 from schneems/schneems/database_url-env-defaultRafael Mendonça França2014-01-0212-19/+12
|\
| * Use DATABASE_URL by defaultschneems2014-01-0212-19/+12
|/
* Merge pull request #13573 from kuldeepaggarwal/doc-fix-default-valuesRafael Mendonça França2014-01-021-2/+2
|\
| * provide correct information [ci skip]Kuldeep Aggarwal2014-01-021-2/+2
* | Merge pull request #13528 from jonleighton/maintain_test_schemaJon Leighton2014-01-0217-58/+173
|\ \
| * | Automatically maintain test database schemaJon Leighton2014-01-0217-58/+173
|/ /
* / Reverse 821525e and wrap run_generator callAndrew White2014-01-022-4/+14
|/
* Adding missing requireRafael Mendonça França2014-01-021-0/+1
* Enable fast_finish in the travis configurationRafael Mendonça França2014-01-021-0/+1
* Merge pull request #13569 from schneems/schneems/default-url-sub-keyRafael Mendonça França2014-01-0111-12/+26
|\
| * Move default production database to URL sub keyschneems2014-01-0111-12/+26
* | Downgrade bundler until 1.5.2 is availableAndrew White2014-01-011-1/+1
|/
* Merge pull request #13542 from robin850/issue-13530Rafael Mendonça França2014-01-013-3/+21
|\
| * Improve enum documentationRobin Dupret2014-01-011-1/+6
| * Fix the enums writer methodsRobin Dupret2014-01-013-2/+15
* | Add CHANGELOG entry for #13557 [ci skip]Rafael Mendonça França2014-01-012-1/+4
* | 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
|\ \ \ \ \ | |/ / / / |/| | | |