aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Revert "Remove update_attribute."Rafael Mendonça França2012-08-254-7/+71
* | | Merge pull request #7029 from panthomakos/date-and-timeRafael Mendonça França2012-08-257-848/+433
|\ \ \
| * | | Refactored common date and time calculations.Pan Thomakos2012-08-047-848/+433
* | | | Merge pull request #7449 from Mik-die/nested-limitsRafael Mendonça França2012-08-254-11/+49
|\ \ \ \
| * | | | changelog #7449Mikhail Dieterle2012-08-261-0/+4
| * | | | allow to pass Symbol or Proc into :limit option of #accepts_nested_attributes...Mikhail Dieterle2012-08-263-11/+45
* | | | | Create variable only in the test that uses itCarlos Antonio da Silva2012-08-251-3/+3
|/ / / /
* | | | Merge pull request #7435 from nashby/fix-issue-7431Rafael Mendonça França2012-08-253-2/+34
|\ \ \ \
| * | | | correct handling of date selects when using both disabled and discard optionsVasiliy Ermolovich2012-08-253-2/+34
|/ / / /
* | | | simplifies yet another regexpXavier Noria2012-08-251-1/+1
* | | | instead of returning $& if =~ succeeds, use String#[]Xavier Noria2012-08-251-1/+1
* | | | simplifies a regexpXavier Noria2012-08-251-1/+1
* | | | use Hash#fetch to eliminate conditionalAaron Patterson2012-08-241-8/+3
* | | | call methods on AR::Model after ClassMethods module is definedAaron Patterson2012-08-241-1/+2
* | | | Merge pull request #7342 from sobrinho/masterRafael Mendonça França2012-08-246-5/+64
|\ \ \ \
| * | | | Accept a symbol for `:in` option on inclusion and exclusion validatorsGabriel Sobrinho2012-08-246-5/+64
* | | | | Merge pull request #7436 from sikachu/master-remove-active_record-session_storeJosé Valim2012-08-2425-976/+41
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Raise more helpful error message on missing gemPrem Sichanugrist2012-08-242-0/+26
| * | | | Remove meta Sesion Migration generatorPrem Sichanugrist2012-08-242-16/+0
| * | | | Update guide/release note about AR::SessionStorePrem Sichanugrist2012-08-244-14/+6
| * | | | Extract ActiveRecord::SessionStore from RailsPrem Sichanugrist2012-08-2418-947/+10
|/ / / /
* | | | Merge pull request #7058 from frodsan/fix_as_random_testsRafael Mendonça França2012-08-246-25/+36
|\ \ \ \
| * | | | Fix ActionMailer tests that depend on run orderFrancesco Rodriguez2012-08-231-5/+9
| * | | | Fix ActiveModel tests that depend on run orderFrancesco Rodriguez2012-08-231-6/+4
| * | | | Fix ActiveSupport tests that depend on run orderFrancesco Rodriguez2012-08-234-14/+23
* | | | | simplifies a regexpXavier Noria2012-08-241-1/+1
* | | | | ivar will always be defined, so stop checkingAaron Patterson2012-08-231-3/+1
* | | | | mysql does not build on Ruby 2.0.0 at the momentAaron Patterson2012-08-231-1/+1
|/ / / /
* | | | Merge pull request #7434 from frodsan/select_list_argumentsAaron Patterson2012-08-232-11/+20
|\ \ \ \
| * | | | Model.select takes a variable list of arguments.Isaac Sanders2012-08-232-11/+20
|/ / / /
* | | | Merge pull request #7061 from davidcelis/masterVijay Dev2012-08-231-1/+3
|\ \ \ \
| * | | | Update the documentation for the :autosave optionDavid Celis2012-08-231-1/+3
|/ / / /
* | | | Revert "Use join without default separator"José Valim2012-08-232-2/+7
* | | | Fix failure on middleware/exceptions_testJosé Valim2012-08-232-11/+5
* | | | Update the ducumentation about the before_eager_load callback [ci skip]Rafael Mendonça França2012-08-221-1/+1
* | | | before_eager_load only runs when eager_load is trueRafael Mendonça França2012-08-221-4/+4
* | | | skip the memcache tests if the memcache server is not upAaron Patterson2012-08-222-48/+50
* | | | revises a brittle test in Active SupportXavier Noria2012-08-222-12/+22
* | | | edit secret token template comment [ci skip]Vijay Dev2012-08-231-1/+1
* | | | copy edit the time_ago_in_words helper docsVijay Dev2012-08-231-4/+4
* | | | Merge pull request #7398 from iamvery/time_ago_in_words-docsVijay Dev2012-08-221-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Extended documentation for `time_ago_in_words` helperJay Hayes2012-08-201-0/+7
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-222-19/+18
|\ \ \ \
| * | | | giving a pause usually made for e.g. in sentences [ci skip]Soon Van2012-08-211-15/+14
| * | | | Revert "association_basics, updated how inverse_of works"Rafael Mendonça França2012-08-201-3/+2
| * | | | association_basics, updated how inverse_of worksOlli Huotari2012-08-201-2/+3
| * | | | Make a doc example output in match actual outputEvan Farrar2012-08-151-4/+4
* | | | | Merge pull request #7413 from siong1987/secret_tokenCarlos Antonio da Silva2012-08-221-0/+3
|\ \ \ \ \
| * | | | | remind user a good way to generate a secret code.Teng Siong Ong2012-08-211-0/+3
|/ / / / /
* | | | | Merge pull request #6606 from amatsuda/ar_relation_model_methodRafael Mendonça França2012-08-212-0/+6
|\ \ \ \ \