aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19610 from yui-knk/fix/suppressAbdelkader Boudih2015-04-011-1/+1
|\
| * [ci skip] Replace `reraised` with `not captured`yui-knk2015-04-021-1/+1
* | Merge pull request #19609 from davydovanton/docs-add-target-blank-infoAbdelkader Boudih2015-04-011-0/+6
|\ \ | |/ |/|
| * [skip ci] Add information about #link_to target optionAnton Davydov2015-04-011-0/+6
|/
* Merge pull request #19607 from rousisk/docs_sql_execute_correctionRafael Mendonça França2015-04-011-1/+1
|\
| * [ci skip] fix guides example on arbitrary SQL executionKonstantinos Rousis2015-04-011-1/+1
|/
* Merge pull request #19606 from yui-knk/fix/query_mdRafael Mendonça França2015-04-011-1/+1
|\
| * [ci skip] Fix `:having` option with `having` methodyui-knk2015-04-011-1/+1
|/
* Merge pull request #19605 from 1337807/patch-1Rafael Mendonça França2015-04-011-0/+12
|\
| * Update routing.mdJonan Scheffler2015-04-011-0/+12
|/
* Merge pull request #19604 from aaronjensen/speed-up-time-coercionRafael Mendonça França2015-04-011-2/+4
|\
| * Only coerce time when comparing if necessaryAaron Jensen2015-03-311-2/+4
|/
* Merge pull request #19586 from mechanicles/fix-eager-loading-for-find-methodsRafael Mendonça França2015-03-312-1/+18
|\
| * Fix eager loading association using default_scope for finder methods.Santosh Wadghule2015-03-312-1/+18
* | Merge pull request #19603 from eliotsykes/remove-considerations-sectionRafael Mendonça França2015-03-311-9/+0
|\ \
| * | Remove unused subdir deployment considerations section [ci skip]Eliot Sykes2015-03-311-9/+0
|/ /
* | Make method as nodoc since we are already docummenting at AbstractAdapterRafael Mendonça França2015-03-311-1/+1
* | Merge pull request #19599 from y-yagi/application_job_templateCarlos Antonio da Silva2015-03-311-1/+0
|\ \
| * | remove extra newline from ApplicationJob templateyuuji.yaginuma2015-03-311-1/+0
|/ /
* | Merge pull request #19596 from yui-knk/fix/comment_alias_attributeArthur Nogueira Neves2015-03-311-1/+1
|\ \
| * | [ci skip] Replace `query methods` with `a predicate`yui-knk2015-03-311-1/+1
|/ /
* | Merge pull request #19595 from claudiob/fix-docs-set-callbackYves Senn2015-03-311-4/+6
|\ \
| * | Fix doc: set_callback also accepts an array of if:claudiob2015-03-311-4/+6
* | | Merge pull request #19523 from kuldeepaggarwal/fix-table-name-conflictYves Senn2015-03-312-2/+4
|\ \ \ | |/ / |/| |
| * | use Model.reset_column_information to clear table cache connection wide.Kuldeep Aggarwal2015-03-312-2/+4
|/ /
* | Merge pull request #19594 from radar/require-module-delegationGuillermo Iguaran2015-03-301-0/+1
|\ \
| * | Require Module#delegate core ext in ActiveModel::NamingRyan Bigg2015-03-311-0/+1
* | | Merge pull request #19592 from adimitri/activerecord-find-ambiguityRafael Mendonça França2015-03-301-3/+1
|\ \ \
| * | | [ci skip] Combine complementary AR #find doc linesAlexander Dimitriyadi2015-03-301-3/+1
|/ / /
* | | Require the extensions to tests pass in isolationRafael Mendonça França2015-03-301-0/+1
* | | Merge pull request #19021 from morgoth/activemodel-errors-refactoringRafael Mendonça França2015-03-302-24/+10
|\ \ \
| * | | Simplify and alias ActiveModel::Errors methods where possibleWojciech Wnętrzak2015-02-202-24/+10
* | | | Revert "Remove Array#inquiry"Rafael Mendonça França2015-03-304-1/+27
* | | | Merge pull request #19034 from jvanbaarsen/explicit-job-base-classMatthew Draper2015-03-308-6/+33
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add explicit base class for ActiveJob jobsJeroen van Baarsen2015-03-238-6/+33
* | | | Merge pull request #19587 from rails/rm-sprockets-3Rafael Mendonça França2015-03-295-17/+16
|\ \ \ \
| * | | | Test using sprockets 3Rafael Mendonça França2015-03-295-17/+16
|/ / / /
* | | | Merge pull request #19581 from kirs/bin-deprecation-versionRafael Mendonça França2015-03-291-1/+2
|\ \ \ \
| * | | | Replace `in Rails 4` with `in Rails %version%` in deprecation messageKir Shatrov2015-03-291-1/+2
* | | | | Merge pull request #19585 from sgrif/sg-deprecate-tokenizerRafael Mendonça França2015-03-293-12/+51
|\ \ \ \ \
| * | | | | Deprecate the `:tokenizer` option to `validates_length_of`Sean Griffin2015-03-293-12/+51
|/ / / / /
* / / / / Clarify the role of `ActiveRecord::Core.encode_with`Sean Griffin2015-03-291-4/+8
|/ / / /
* | | | Reduce memory usage when loading types in PGSean Griffin2015-03-294-10/+40
* | | | Merge pull request #19483 from yui-knk/fix/getting_startedZachary Scott2015-03-291-1/+1
|\ \ \ \
| * | | | [ci skip] Fix an object of `reference`yui-knk2015-03-241-1/+1
* | | | | Merge pull request #19575 from y-yagi/fix_batches_testZachary Scott2015-03-291-2/+3
|\ \ \ \ \
| * | | | | use correct method in batches testyuuji.yaginuma2015-03-291-2/+3
|/ / / / /
* | | | | Merge pull request #19544 from shuhei/fix-parameters-const-missingXavier Noria2015-03-282-2/+9
|\ \ \ \ \
| * | | | | Return super in ActionController::Parameters.const_missingShuhei Kagawa2015-03-282-2/+9
* | | | | | Remove circular requireRafael Mendonça França2015-03-272-4/+0