aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix error message of option as with invalid charters in partial renderingAngelo capilleri2014-12-293-5/+32
* Merge branch 'master' of github.com:rails/rails [ci skip]Zachary Scott2014-12-291-0/+8
|\
| * Merge pull request #18249 from claudiob/add-doc-for-save-with-touchRafael Mendonça França2014-12-291-0/+8
| |\
| | * Add doc for `:touch` option of AR::Base#saveclaudiob2014-12-301-0/+8
* | | Remove pre-4.2 comment about missing `assert_select` [ci skip]Zachary Scott2014-12-291-2/+0
* | | Update link to rails-dom-testing documentation [ci skip]Zachary Scott2014-12-291-1/+1
* | | Pass through `assert_select` testing guide [ci skip]Zachary Scott2014-12-291-4/+9
|/ /
* | Implement testing `flash` notices into our blog app [ci skip]Zachary Scott2014-12-291-3/+62
* | Pass through Testing Templates and Layouts section [ci skip]Zachary Scott2014-12-291-11/+13
* | These are technically objects [ci skip]Zachary Scott2014-12-291-2/+2
* | Rephrase Four Hashes of the Apocalypse [ci skip]Zachary Scott2014-12-291-1/+1
|/
* Compare http request type with test equivalent methods, and application use-c...Zachary Scott2014-12-291-2/+2
* Merge pull request #18246 from aprescott/document-include_all_helpers-settingRafael Mendonça França2014-12-291-0/+2
|\
| * Document the include_all_helpers config setting.Adam Prescott2014-12-291-0/+2
* | Merge pull request #18244 from cristianbica/remove-object-itselfRafael Mendonça França2014-12-293-25/+0
|\ \ | |/ |/|
| * Removed Object#itself as it's implemented in ruby 2.2Cristian Bica2014-12-293-25/+0
* | Rephrase functional testing in its relation to Rails Controller Unit Testing.Zachary Scott2014-12-291-1/+1
|/
* Merge pull request #18243 from JoshCheek/mailer_guide_code_exampleCarlos Antonio da Silva2014-12-291-1/+3
|\
| * Un-inline if statementJosh Cheek2014-12-291-1/+3
|/
* Merge pull request #18240 from shunsukeaida/add_tzinfo_data_to_plugin_gemfileRafael Mendonça França2014-12-291-0/+4
|\
| * plugin's gemfile also needs tzinfo-data in WindowsShunsukeAida2014-12-301-0/+4
* | Remove some warning with Ruby 2.2Rafael Mendonça França2014-12-291-1/+1
* | Ensure `first!` and friends work on loaded associationsSean Griffin2014-12-293-0/+12
* | Require Arel 7.0.0.alphaSean Griffin2014-12-291-1/+1
* | Remove all cases of manuallly wrapping `Arel::Nodes::Quoted`Sean Griffin2014-12-297-34/+15
* | Pass a type caster when aliasing tables for joinsSean Griffin2014-12-294-10/+15
* | Fix failing testsSean Griffin2014-12-291-8/+4
* | Extract an explicit type caster classSean Griffin2014-12-298-39/+69
* | Rely on the injectable type caster for `arel_table`Sean Griffin2014-12-296-74/+22
* | Merge pull request #18097 from k0kubun/readonly-eager_loadRafael Mendonça França2014-12-293-1/+11
|\ \
| * | `eager_load` preserves readonly flag for associationsTakashi Kokubun2014-12-303-1/+11
* | | Add nodoc to touch at no_touching.rbRafael Mendonça França2014-12-291-1/+1
| |/ |/|
* | Just check if the buffer exists before changing itRafael Mendonça França2014-12-292-6/+4
* | Merge pull request #18236 from vipulnsward/dont-eval-frozenRafael Mendonça França2014-12-292-1/+12
|\ \ | |/ |/|
| * When trying to access a character on a string buffer object via `:[]`, if the...Vipul A M2014-12-292-1/+12
|/
* Merge pull request #18232 from yousuketto/doc-for-bundler-requireYves Senn2014-12-291-1/+1
|\
| * adjust args of Bundler.require in guides [ci skip]Yosuke2014-12-291-1/+1
|/
* Merge pull request #18231 from untidy-hair/improve_a_testGuillermo Iguaran2014-12-281-1/+1
|\
| * Expectation comes firstYukio Mizuta2014-12-281-1/+1
|/
* Minor documentation edits [ci skip]Robin Dupret2014-12-286-19/+19
* Merge pull request #18209 from claudiob/bump-to-2-2Guillermo Iguaran2014-12-2810-12/+12
|\
| * Require Ruby 2.2 for Rails 5.0claudiob2014-12-2610-12/+12
* | Merge pull request #18213 from agrobbin/moar-concernsSean Griffin2014-12-283-4/+34
|\ \
| * | actually autoload all second-level directories called `app/*/concerns`Alex Robbin2014-12-263-4/+34
* | | docs, cleanup Active Record CHANGELOG. [ci skip]Yves Senn2014-12-281-4/+4
* | | Merge pull request #18229 from benprew/patch-2Sean Griffin2014-12-281-4/+2
|\ \ \
| * | | Update example test documentationBen Prew2014-12-281-4/+2
|/ / /
* | | Merge pull request #18226 from kamipo/fix_warning_interpreted_as_argument_prefixGuillermo Iguaran2014-12-281-1/+1
|\ \ \
| * | | Fix warning: `*' interpreted as argument prefixRyuta Kamizono2014-12-281-1/+1
|/ / /
* | | Merge pull request #18225 from DanOlson/update-without-changing-timestampsSean Griffin2014-12-275-10/+48
|\ \ \