aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11783 from davetoxa/patch-1Carlos Antonio da Silva2013-08-061-3/+3
|\
| * Bump ruby version [ci skip]Anton Cherepanov2013-08-071-3/+3
|/
* test to express that we can't turn non-array columns to array columns.Yves Senn2013-08-061-0/+9
* Merge pull request #11780 from thedarkone/logger-naked-rescue-fixGuillermo Iguaran2013-08-062-3/+7
|\
| * "Naked" rescue clauses only catch StandardError subclasses.thedarkone2013-08-062-3/+6
| * Add a missing require.thedarkone2013-08-061-0/+1
|/
* Use the proper encoding comment on the fileRafael Mendonça França2013-08-061-0/+2
* Fix indentationRafael Mendonça França2013-08-061-3/+2
* asakusa.rb hack night!Aaron Patterson + Akira Matsuda2013-08-062-0/+5
* Add CHANGELOG entry for #11767Rafael Mendonça França2013-08-061-0/+4
* Merge pull request #11778 from jetthoughts/11759_update_assets_guidesRafael Mendonça França2013-08-061-2/+2
|\
| * #11759: Update Assets Pipeline GuidePaul Nikitochkin2013-08-061-2/+2
* | adding a weird test caseAaron Patterson2013-08-062-0/+8
|/
* Merge pull request #11771 from atambo/jruby_assert_distance_of_time_in_wordsRafael Mendonça França2013-08-051-5/+7
|\
| * Remove privatizing of Fixnum#/ from assert_distance_of_time_in_wordsAlex Tambellini2013-08-051-5/+7
|/
* Merge pull request #11743 from gaurish/tmp-magicGuillermo Iguaran2013-08-051-0/+0
|\
| * Add tmp dir in actionview/test/Gaurish Sharma2013-08-051-0/+0
* | config[:database] should be a stringRafael Mendonça França2013-08-051-3/+3
* | Remove deprecated branch on the scope method.Rafael Mendonça França2013-08-051-6/+2
* | Use the right instrumentation nameRafael Mendonça França2013-08-053-3/+7
* | Merge pull request #11767 from kassio/master-load-fixtures-from-linked-folderRafael Mendonça França2013-08-055-4/+17
|\ \
| * | load fixtures from linked foldersKassio Borges2013-08-055-4/+17
* | | Merge pull request #11666 from prathamesh-sonpatki/doc-fixXavier Noria2013-08-051-3/+3
|\ \ \
| * | | Removed confusing statements about routes in getting started guide [ci skip]Prathamesh Sonpatki2013-08-051-3/+3
* | | | Merge pull request #11762 from peterkovacs/patch-2Carlos Antonio da Silva2013-08-051-1/+1
|\ \ \ \
| * | | | Free result_metadata directly instead of freeing 2nd, redundant call.Peter Kovacs2013-08-051-1/+1
| |/ / /
* | | | Merge pull request #11763 from schneems/schneems/create-sqlite3dbJosé Valim2013-08-053-3/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Create sqlite3 directory if not presentschneems2013-08-053-3/+30
|/ / /
* | | migrations guide: fix and edits [ci skip]Xavier Noria2013-08-051-7/+9
* | | getting started guide: pass the resource to the URL helper [ci skip]Xavier Noria2013-08-051-1/+1
* | | Merge pull request #11760 from rahul100885/masterRafael Mendonça França2013-08-051-0/+1
|\ \ \
| * | | Added data for permit array into scalar valueRahul P. Chaudhari2013-08-051-0/+1
* | | | Merge pull request #11757 from ryog/fix_document_active_model_errorsRafael Mendonça França2013-08-051-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix: documentation for ActiveModel::ErrorsRyoji Yoshioka2013-08-051-4/+4
|/ / /
* | | Merge pull request #11751 from rmm5t/assert_dom_equal-messageRafael Mendonça França2013-08-042-4/+11
|\ \ \
| * | | Pass assert_dom_equal message arg to underlying assertionRyan McGeary2013-08-042-4/+11
* | | | Add CHANGELOG entry for #11665Rafael Mendonça França2013-08-041-0/+4
* | | | Merge pull request #11665 from mshytikov/fix-config-log_levelRafael Mendonça França2013-08-043-2/+11
|\ \ \ \
| * | | | fix testsMax Shytikov2013-07-301-1/+1
| * | | | Rails.logger should have level specified by config.log_level. Max Shytikov2013-07-302-1/+10
* | | | | Merge pull request #11677 from jaggederest/masterRafael Mendonça França2013-08-041-1/+1
|\ \ \ \ \
| * | | | | remove language about configuring digest method [ci skip]Justin George2013-07-311-1/+1
| * | | | | update guide to reflect default HMAC SHA1 in MessageVerifier used in SignedCo...Justin George2013-07-301-1/+1
* | | | | | Merge pull request #11693 from egilburg/minor_relation_refactorRafael Mendonça França2013-08-041-38/+45
|\ \ \ \ \ \
| * | | | | | Minor optimization and code cleanup in query_methods.Eugene Gilburg2013-07-311-38/+45
* | | | | | | Merge pull request #11749 from Alamoz/getting_started_guideRafael Mendonça França2013-08-041-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Added to 'Security' section; especially reference to 'Ruby on Rails Security ...Adrien Lamothe2013-08-041-0/+15
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #11737 from tkhr/fix-document-about-on-validation-helpersRafael Mendonça França2013-08-041-3/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix active_record_validations.md document, `:save` for `on:` validation helpe...Takehiro Adachi2013-08-041-3/+2
* | | | | | | No need to use blocks hereAndrew White2013-08-041-11/+9