aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsVijay Dev2014-11-30396-4136/+3261
|\
| * Fix grammar on ActiveRecord::AttributeMethods doc.Hendy Tanata2014-11-301-1/+1
| * [Testing guide] Using "Fixtures API" consistentlyPrathamesh Sonpatki2014-11-301-1/+1
| * [Testing guide] Use "Fixtures API" instead of "fixture api".Prathamesh Sonpatki2014-11-301-1/+1
| * Merge pull request #17850 from y-yagi/patch-2Richard Schneeman2014-11-302-18/+1
| |\
| | * [ci skip] fix description of url_foryuuji.yaginuma2014-11-302-18/+1
| * | Update Arel usage for rails/arel#98fc259Sean Griffin2014-11-294-8/+8
| |/
| * Use arel masterSean Griffin2014-11-291-0/+1
| * Stop using `Arel::Table.engine`Sean Griffin2014-11-294-5/+5
| * Merge pull request #17823 from byroot/fix-mount-rack-apps-with-asSean Griffin2014-11-293-8/+22
| |\
| | * Pure rack apps can be mounted with a nameJean Boussier2014-11-293-8/+22
| * | Merge pull request #17848 from biow0lf/fix-link-in-action_view-baseSean Griffin2014-11-291-2/+2
| |\ \
| | * | Fix link in documentation. [ci skip]Igor Zubkov2014-11-301-2/+2
| |/ /
| * | Merge pull request #17846 from biow0lf/bump-ruby-versionMatthew Draper2014-11-301-1/+1
| |\ \
| | * | Bump ruby version to 2.1.0 in rails.gemspec too.Igor Zubkov2014-11-291-1/+1
| |/ /
| * | Merge pull request #16833 from sferik/symbol_to_procRafael Mendonça França2014-11-29120-276/+244
| |\ \
| | * | Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-29120-276/+244
| |/ /
| * | adds missing period in test.rb [ci skip]Xavier Noria2014-11-291-1/+1
| * | Merge pull request #17816 from byroot/prevent-numeric-to-s-to-allocate-an-arrayRafael Mendonça França2014-11-292-16/+25
| |\ \
| | * | Prevent Numeric#to_s from allocating an arrayJean Boussier2014-11-282-16/+25
| | |/
| * | Merge pull request #17830 from claudiob/bump-required-ruby-versionRafael Mendonça França2014-11-299-11/+11
| |\ \
| | * | Bump required Ruby version to 2.1.0claudiob2014-11-289-11/+11
| |/ /
| * | Merge pull request #17838 from claudiob/remove-ruby19-reference-in-guidesArthur Nogueira Neves2014-11-281-1/+1
| |\ \
| | * | Remove a reference to Ruby 1.9 in Guidesclaudiob2014-11-281-1/+1
| |/ /
| * | Merge pull request #17828 from yui-knk/fix/i18n_guideZachary Scott2014-11-281-1/+1
| |\ \
| | * | [ci skip] fix class nameyui-knk2014-11-291-1/+1
| |/ /
| * | Allow failures with Active Job integration testsRafael Mendonça França2014-11-281-0/+1
| * | Allow failures with Active JobRafael Mendonça França2014-11-281-1/+3
| * | Merge pull request #17818 from bigtone1284/edits_refactor_copRafael Mendonça França2014-11-281-1/+1
| |\ \
| | * | fixed indent of end in jdom.rbbigtone12842014-11-281-1/+1
| * | | Merge pull request #17799 from kamipo/refactor_add_column_optionsRafael Mendonça França2014-11-282-6/+14
| |\ \ \
| | * | | Rename to `quote_default_expression` from `quote_value`Ryuta Kamizono2014-11-282-3/+3
| | * | | Refactor `add_column_options!`, to move the quoting of default value for :uui...Ryuta Kamizono2014-11-281-4/+12
| * | | | Use jquery-rails master to resolve dependenciesRafael Mendonça França2014-11-281-2/+2
| | |/ / | |/| |
| * | | We don't need to use sass-rails 5.0.0.betaRafael Mendonça França2014-11-281-2/+1
| * | | Start Rails 5 development :tada:Rafael Mendonça França2014-11-2820-2746/+37
| | |/ | |/|
| * | Merge pull request #17812 from jonatack/patch-8Abdelkader Boudih2014-11-281-19/+19
| |\ \
| | * | 4.2 release notes pass [skip ci]Jon Atack2014-11-281-19/+19
| * | | Merge pull request #17811 from mrnugget/fixes_nested_association_preloadingSantiago Pastorino2014-11-282-0/+9
| |\ \ \ | | |/ / | |/| |
| | * | Adds preloaded_records method to NullPreloaderThorsten Ball2014-11-282-0/+9
| |/ /
| * | Merge pull request #17808 from yuki24/fix-bug-where-record-not-saved-loses-er...Rafael Mendonça França2014-11-285-12/+31
| |\ \
| | * | Fix a bug where AR::RecordNotSaved loses error messagesYuki Nishijima2014-11-275-12/+31
| | |/
| * | Merge pull request #17809 from iainbeeston/remove_ecosystem_from_guidesXavier Noria2014-11-280-0/+0
| |\ \
| | * | Removed ecosystem link from the header of the guides pagesIain Beeston2014-11-281-1/+0
| * | | Merge pull request #17798 from kamipo/refactor_visit_add_columnYves Senn2014-11-282-9/+1
| |\ \ \
| | * | | Refactor `SchemaCreation#visit_AddColumn`Ryuta Kamizono2014-11-272-9/+1
| * | | | docs, AR no longer makes use of `test:prepare`. [ci skip]Yves Senn2014-11-281-1/+2
| | |_|/ | |/| |
| * | | Merge pull request #17807 from jvperrin/correct-integer-testRafael Mendonça França2014-11-271-1/+1
| |\ \ \
| | * | | Correct test description for large integer testJason Perrin2014-11-031-1/+1
| * | | | release notes: edit pass [ci skip]Xavier Noria2014-11-271-19/+17