aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / /
* | | Merge pull request #7406 from janko-m/documentation_fixesRafael Mendonça França2012-08-212-45/+45
|\ \ \
| * | | Fix documentation mistakesJanko Marohnić2012-08-212-45/+45
* | | | Merge pull request #7000 from kennyj/fix_6697-3Rafael Mendonça França2012-08-218-11/+31
|\ \ \ \
| * | | | Use instance_accessor: false instead of instance_writer.kennyj2012-08-218-11/+31
|/ / / /
* | | | Add CHANGELOG entry for #6986Rafael Mendonça França2012-08-211-0/+5
* | | | Merge pull request #6986 from kennyj/fix_6975Rafael Mendonça França2012-08-212-5/+29
|\ \ \ \
| * | | | Round usec when writing timestamp attribute.kennyj2012-08-212-5/+29
|/ / / /
* | | | Minor refactoring in Active Record model schema methodsCarlos Antonio da Silva2012-08-211-5/+3
* | | | removing dead codeAaron Patterson2012-08-201-19/+7
* | | | define singleton methods rather than adding and removing methodsAaron Patterson2012-08-201-45/+32
* | | | remove dead codeAaron Patterson2012-08-201-78/+36
* | | | initialize instance variables for transactions to remove conditionalsAaron Patterson2012-08-202-8/+7
* | | | This method is useless without a block, so remove testAaron Patterson2012-08-201-11/+9
* | | | remove unused variableAaron Patterson2012-08-201-1/+1
* | | | initialize instance variables to avoid conditionalsAaron Patterson2012-08-201-2/+7
* | | | fix whitespace errorsAaron Patterson2012-08-201-2/+2
* | | | Revert "removes unused optional argument in AS::Dependencies::Loadable#load"Xavier Noria2012-08-201-1/+1
* | | | removes unused optional argument in AS::Dependencies::Loadable#loadXavier Noria2012-08-201-1/+1
* | | | Merge pull request #7401 from frodsan/fix_environments_punctuationCarlos Antonio da Silva2012-08-207-12/+12
|\ \ \ \
| * | | | fix punctuation in config templatesFrancesco Rodriguez2012-08-207-12/+12
|/ / / /
* | | | Make sure :via works with mountPratik Naik2012-08-202-2/+12
* | | | Merge pull request #7396 from tomykaira/cleanup_testRafael Mendonça França2012-08-201-11/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Access @rs only through attr_accessortomykaira2012-08-201-11/+11
|/ / /
* | | removes the second argument of the AS const_missing hookXavier Noria2012-08-191-8/+22
* | | Remove private verify readonly attr methodCarlos Antonio da Silva2012-08-191-5/+1
* | | no need for AS::Dependencies.(hook!|unhook!) to return anything in particularXavier Noria2012-08-191-2/+0