aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #7525 from seamusabshere/use-mysql-binary-for-rake-db-stru...Rafael Mendonça França2012-09-052-9/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Use the 'mysql' binary for 'rake db:structure:load'.Seamus Abshere2012-09-052-9/+10
* | | | Define just the cattr_reader.Rafael Mendonça França2012-09-051-1/+2
* | | | Use the same logger that ActionView::Base for the DigestorRafael Mendonça França2012-09-052-16/+22
* | | | Remove unneeded requiresRafael Mendonça França2012-09-051-7/+3
* | | | Merge pull request #7337 from adzap/string_to_dummy_timeRafael Mendonça França2012-09-053-1/+23
|\ \ \ \
| * | | | Update changelog with time column type casting fixAdam Meehan2012-09-051-0/+4
| * | | | Fix for time type columns with invalid timeAdam Meehan2012-09-052-1/+19
* | | | | Merge pull request #7447 from etehtsea/postgresql-adapterRafael Mendonça França2012-09-057-988/+1038
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Modularize postgresql adapterKonstantin Shabanov2012-09-057-988/+1038
* | | | | Merge pull request #7530 from robin850/masterXavier Noria2012-09-051-1/+1
|\ \ \ \ \
| * | | | | Fix a typoRobin Dupret2012-09-051-1/+1
* | | | | | Merge pull request #7519 from leocassarani/merge-with-blockRafael Mendonça França2012-09-043-6/+50
|\ \ \ \ \ \
| * | | | | | Extend HashWithIndifferentAccess#update to take an optional blockLeo Cassarani2012-09-053-6/+50
|/ / / / / /
* | | | | | Merge pull request #7522 from lexmag/mime_typeRafael Mendonça França2012-09-042-85/+94
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Refactor `Mime::Type`Aleksey Magusev2012-09-052-85/+94
* | | | | | We dont need to include the name and the format in the digest -- source is au...David Heinemeier Hansson2012-09-041-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #7422 from ernie/improvements-to-improved-routingDavid Heinemeier Hansson2012-09-043-14/+103
|\ \ \ \ \
| * | | | | Make enhanced routing Concerns more tell-don't-askErnie Miller2012-09-032-37/+70
| * | | | | Fix concerns not executing block in mapperErnie Miller2012-09-032-2/+29
| * | | | | Allow routing concerns to accept a callableErnie Miller2012-09-033-5/+34
* | | | | | revised the exception message "Expected #{file_path} to define #{qualified_na...Xavier Noria2012-09-041-1/+1
* | | | | | Merge pull request #7515 from senny/custom_inheritance_column_test_refactoringRafael Mendonça França2012-09-039-65/+66
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | test cleanup, remove ruby_type because it's no longer neededYves Senn2012-09-037-16/+5
| * | | | | rewrite inheritance tests with a custom inheritance_columnYves Senn2012-09-034-49/+61
|/ / / / /
* | | | | Merge pull request #7506 from senny/issue_7503Rafael Mendonça França2012-09-035-2/+38
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | set the configured #inheritance_column on #become (#7503)Yves Senn2012-09-035-2/+38
* | | | | Merge pull request #7502 from xoen/fixed-upgrading-guide-markupCarlos Antonio da Silva2012-09-021-2/+12
|\ \ \ \ \
| * | | | | Fixed markup in Upgrading RoR guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-2/+12
| |/ / / /
* | | | | Merge pull request #7504 from behrends/patch-1Carlos Antonio da Silva2012-09-021-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix example code: use tasks instead of commentsErik Behrends2012-09-021-1/+1
|/ / / /
* | | | Merge pull request #7495 from steveklabnik/issue_7478Aaron Patterson2012-09-013-4/+18
|\ \ \ \
| * | | | Force reloading of the session after destroyAndreas Loupasakis2012-09-011-0/+3
| * | | | Override rack's destroy_session in cookie storeAndreas Loupasakis2012-09-011-0/+8
| * | | | Assign a new session_id to session options hashAndreas Loupasakis2012-09-011-2/+2
| * | | | Properly reset the session on reset_sessionSteve Klabnik2012-08-311-2/+5
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-0117-36/+111
|\ \ \ \ \
| * | | | | copy edits [ci skip]Vijay Dev2012-09-012-4/+2
| * | | | | Revert "added .DS_Store to .gitignore"Vijay Dev2012-09-011-1/+0
| * | | | | reverting changes from commit b0896c38Sven Kraeuter | 5v3n2012-09-011-1/+1
| * | | | | Fix comment about Session.Steve Klabnik2012-08-311-1/+1
| * | | | | Fix my bioPratik Naik2012-08-311-1/+1
| * | | | | Merge pull request #111 from 5v3n/masterSven Kräuter2012-08-311-1/+1
| |\ \ \ \ \
| | * | | | | there is no "delete" action in a controllerSven Kräuter2012-08-311-1/+1
| |/ / / / /
| * | | | | In example about params naming conventions use params[:person] [ci skip]Aldo "xoen" Giambelluca2012-08-311-1/+1
| * | | | | Merge pull request #106 from neilstockbridge/masterJeff Shantz2012-08-301-1/+1
| |\ \ \ \ \
| | * | | | | Added a note for smtp_settings.enable_starttls_autoNeil Stockbridge2012-08-081-1/+1
| * | | | | | in section 4.1 acts_as_yaffle_test was incorrectly failing due to assertion i...Kevin Musiorski2012-08-301-2/+2
| * | | | | | added .DS_Store to .gitignoreKevin Musiorski2012-08-301-0/+1
| * | | | | | Added example of using options_for_select() with select_tag()Kir Shatrov2012-08-301-0/+4