aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10211 from neerajdotname/4208Rafael Mendonça França2013-04-193-1/+41
|\
| * fix respond_to? for non selected columnNeeraj Singh2013-04-193-1/+41
|/
* Merge pull request #10267 from vipulnsward/use_destructive_methodRafael Mendonça França2013-04-192-2/+2
|\
| * symbolize_keys => symbolize_keys! on new hash;Vipul A M2013-04-192-2/+2
* | Merge pull request #10265 from wangjohn/documenting_actionviewRafael Mendonça França2013-04-194-0/+41
|\ \
| * | Adding documentation to actionview so that the big picture of thewangjohn2013-04-184-0/+41
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2013-04-199-15/+66
|\ \ \
| * | | Revert "Merge pull request #10183 from jholton/fix_association_auto_save"Jon Leighton2013-04-193-29/+9
| * | | Merge pull request #10183 from jholton/fix_association_auto_saveJon Leighton2013-04-193-9/+29
| |\ \ \
| | * | | destroys association records before saving/inserting new association recordsJohnny Holton2013-04-193-9/+29
| |/ / /
| * | | Merge pull request #10264 from cconstantine/masterRafael Mendonça França2013-04-192-1/+7
| |\ \ \
| | * | | Fix loading of fixtures when the column type is a postgres array of strings.Chris Constantine2013-04-182-1/+7
| | |/ /
| * | | Improve the error messageRafael Mendonça França2013-04-192-2/+2
| * | | Merge pull request #10217 from mirasrael/make-migrator-run-transactional-4.0Rafael Mendonça França2013-04-193-5/+42
| |\ \ \
| | * | | Support transactions in Migrator.runbondarev2013-04-183-5/+42
| * | | | Merge pull request #10200 from calebthompson/ct-fix-freeze-freezing-cloned-mo...Jon Leighton2013-04-192-2/+11
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix freeze applying to cloned objectsCaleb Thompson2013-04-152-2/+11
| * | | | Merge pull request #10235 from joergleis/patch-1Michael Koziarski2013-04-181-5/+4
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Reorganize MessageEncryptorjgls2013-04-191-5/+4
| * | | | Unindent attributes iteration in scaffold index templateCarlos Antonio da Silva2013-04-181-2/+2
* | | | | AlignmentDavid Heinemeier Hansson2013-04-181-1/+1
|/ / / /
* | | | Indent around the scaffold loopDavid Heinemeier Hansson2013-04-181-8/+8
* | | | HTML5 breaksDavid Heinemeier Hansson2013-04-182-4/+4
* | | | Better orderingDavid Heinemeier Hansson2013-04-181-3/+3
* | | | Revert "Merge pull request #10043 from cconstantine/master"Rafael Mendonça França2013-04-182-21/+0
* | | | Use sprockets-rails 2.0.0.rc4Guillermo Iguaran2013-04-181-1/+1
* | | | Use sass-rails 4.0.0.rc1Rafael Mendonça França2013-04-181-1/+1
* | | | Use the same uglifier version that the generated applicationsRafael Mendonça França2013-04-181-1/+1
* | | | Use latest coffee-rails releaseRafael Mendonça França2013-04-182-2/+2
* | | | Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."Rafael Mendonça França2013-04-181-2/+2
* | | | Bump arel to 4.0.0Rafael Mendonça França2013-04-181-1/+1
* | | | Merge pull request #10043 from cconstantine/masterRafael Mendonça França2013-04-182-0/+21
|\ \ \ \
| * | | | Fix loading of string arrays in postgresChris Constantine2013-04-082-0/+21
* | | | | Add CHANGELOG entries - closes #10180, #10185Andrew White2013-04-181-0/+10
* | | | | Refactor ActionDispatch::Http::URL.build_host_urlAndrew White2013-04-182-20/+90
* | | | | Add url generation tests for #10185Andrew White2013-04-181-0/+2
* | | | | Duplicate options before mutating themAndrew White2013-04-182-3/+5
* | | | | Passing subdomain: '' to url_for removes the subdomain (instead of adding a l...Derek Watson2013-04-184-1/+32
* | | | | Merge pull request #10262 from printercu/patch-3Rafael Mendonça França2013-04-182-0/+7
|\ \ \ \ \
| * | | | | Avoid leak into controller's action_methodsprintercu2013-04-182-0/+7
|/ / / / /
* | | | | Merge pull request #10258 from thenickcox/pending_migrations_pluralRafael Mendonça França2013-04-181-3/+3
|\ \ \ \ \
| * | | | | Fix subject-verb agreement in error msg (and other grammar stuff)thenickcox2013-04-171-3/+3
* | | | | | Merge pull request #10259 from prathamesh-sonpatki/secure-engine-testsCarlos Antonio da Silva2013-04-171-1/+1
|\ \ \ \ \ \
| * | | | | | Use secure source for rubygems in engine testsPrathamesh Sonpatki2013-04-181-1/+1
|/ / / / / /
* | | | | | Merge pull request #10255 from wangjohn/increment_or_decrement_refactoring_in...Carlos Antonio da Silva2013-04-171-18/+14
|\ \ \ \ \ \
| * | | | | | The increment and decrement commands in the local cache are exactly thewangjohn2013-04-171-18/+14
|/ / / / / /
* | | | | | Merge pull request #10254 from wangjohn/refactoring_local_cacheCarlos Antonio da Silva2013-04-171-8/+6
|\ \ \ \ \ \
| * | | | | | Refactored the storage of a temporary version of the local cache intowangjohn2013-04-171-8/+6
|/ / / / / /
* | | | | | activerecord-deprecated_finders 1.0.0 has a bug with has_many :throughRafael Mendonça França2013-04-171-1/+1
* | | | | | Merge pull request #10252 from epiclabs/nodoc_registriesRafael Mendonça França2013-04-172-4/+4
|\ \ \ \ \ \