aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
|\ \ \
| * | | AR::Relation#model would be a better API than AR::Relation#klassAkira Matsuda2012-06-032-0/+6
* | | | Add CHANGELOG entry for #3578 [ci skip]Rafael Mendonça França2012-08-212-0/+10
* | | | Merge pull request #3578 from amatsuda/remove_j_alias_for_json_escapeRafael Mendonça França2012-08-211-7/+0
|\ \ \ \
| * | | | Remove j alias for ERB::Util.json_escapeAkira Matsuda2011-11-091-7/+0
* | | | | Remove app building setup/teardown for remote ip railtie testsCarlos Antonio da Silva2012-08-211-14/+0
* | | | | Set eager load option in "make_basic_app" for railties testsCarlos Antonio da Silva2012-08-211-0/+1
* | | | | Merge pull request #7225 from rails/eager_loadJosé Valim2012-08-2133-109/+215
|\ \ \ \ \
| * | | | | add Rack::Lock for webrickAaron Patterson2012-08-211-0/+9
| * | | | | Deprecate config.threadsafe!José Valim2012-08-214-22/+20
| * | | | | Get rid of config.preload_frameworks in favor of config.eager_load_namespacesJosé Valim2012-08-2123-52/+80
| * | | | | Make ActiveSupport::Autoload localJosé Valim2012-08-213-30/+45
| * | | | | Remove allow_concurrency as a flagJosé Valim2012-08-215-12/+9
| * | | | | Allow users to choose when to eager_load the application or not.José Valim2012-08-219-8/+67
* | | | | | Merge pull request #6499 from lazylester/patch-1Carlos Antonio da Silva2012-08-211-1/+1
|\ \ \ \ \ \
| * | | | | | Clarify and correct the description for the --full option of the plugin_new g...lazylester2012-08-211-1/+1
* | | | | | | Use a model without counter cache to test read-only attributesRafael Mendonça França2012-08-211-9/+10
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #5210 from Pliny/masteriRafael Mendonça França2012-08-218-2/+36
|\ \ \ \ \ \
| * | | | | | reset_counters() was crashing when there were multiple belongs_to association...Dave Desrochers2012-08-218-2/+36
* | | | | | | Add CHANGELOG entry for #7410Rafael Mendonça França2012-08-211-0/+5
|/ / / / / /
* | | | | | Merge pull request #7410 from sandeepravi/default_options_helper_valueRafael Mendonça França2012-08-212-0/+13
|\ \ \ \ \ \
| * | | | | | option_tags coerced to "" instead of nilSandeep2012-08-212-0/+13
* | | | | | | Merge pull request #7409 from kennyj/refactor_activerecord_resultRafael Mendonça França2012-08-213-18/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Refactor AR::Result or inherits. Because we have redundant codes aboutkennyj2012-08-223-18/+4
|/ / / / / /
* | | | | | Merge pull request #7408 from yahonda/sqlmode_mysqlCarlos Antonio da Silva2012-08-212-6/+8
|\ \ \ \ \ \
| * | | | | | Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_modeYasuo Honda2012-08-222-6/+8
|/ / / / / /