aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Expand documentation for change() method in Time, Date, and DateTimeJeff Shantz2012-08-293-4/+15
|
* Revert "Grammar"Jo Liss2012-08-301-3/+3
| | | | | | | | Per https://github.com/lifo/docrails/commit/e94e8d8c3fcac624466afcf61f6a118abe5a6af4#commitcomment-1784677 Thanks @randomecho! This reverts commit e94e8d8c3fcac624466afcf61f6a118abe5a6af4.
* GrammarJo Liss2012-08-291-3/+3
|
* Merge pull request #110 from nmadura/masterNathaniel Madura2012-08-291-0/+3
|\ | | | | minor update to asset_pipeline docs describing apache config
| * added a touch more information to the apache configuration instructionsNathaniel Madura2012-08-291-0/+3
|/ | | | | | | In the text there is a section about how to serve the assets with far-future headers. The snippet that is proposed doesn't work on Ubuntu 11 (probably others) as mod_expires is not enabled out-of-the-box. I noted this, and gave an example of how to load mod_expires with a2enmod.
* Merge pull request #109 from aantix/default_security_headers_clarificationsJim Jones2012-08-281-1/+19
|\ | | | | Added clairifications for default security headers.
| * Added clairifications for default security headers.Jim Jones2012-08-271-1/+19
|/
* Merge pull request #108 from homakov/masterEgor Homakov2012-08-271-0/+23
|\ | | | | Default headers description
| * default headers initEgor Homakov2012-08-271-0/+23
|/
* Update guides/source/rails_application_templates.textileDeepak Kannan2012-08-271-1/+1
| | | | | think that a quoted string will be better as it will automatically escape double-quotes as well
* Minor update for usage of git commandDeepak Kannan2012-08-271-1/+1
| | | | | after running, git add . do not need -a option to git commit
* Guide: improvements to "The Flash" section.Henrik N2012-08-251-9/+22
| | | | | Correct :error -> :alert, mention FlashHash class, mention that you're not limited to notices and alerts, clean up.
* Merge pull request #107 from jaimeiniesta/masterXavier Noria2012-08-241-8/+13
|\ | | | | Fix rake guides:validate
| * Add exception handling to rake guides:validateJaime Iniesta2012-08-241-1/+6
| | | | | | | | | | If the validation of a guide encounters an exception, inform about it and continue with the loop to validate the rest.
| * Fix rake guides:validateJaime Iniesta2012-08-241-7/+7
|/ | | | This rake task was looking for the output folder in the wrong place.
* Revert "Fix rake guides:validate task as it should be run from the guides ↵Jaime Iniesta2012-08-241-13/+8
| | | | | | | | directory; add exception handling" This kind of changes should go on a pull request instead. This reverts commit ecae2f0ef0452f8d333525a6aed58e5ab8d3ccb1.
* Merge branch 'master' of github.com:lifo/docrailsAlmudena Garcia2012-08-231-8/+13
|\
| * Fix rake guides:validate task as it should be run from the guides directory; ↵Jaime Iniesta2012-08-231-8/+13
| | | | | | | | add exception handling
* | Fix HTML validation errorsAlmudena Garcia2012-08-234-7/+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
| | | | | | | | | | | | This reverts commit 8cb9460437eddde6952fbebbc969203cd4d00294. Reason: #7377 was merged and it fixes this behavior.
| * association_basics, updated how inverse_of worksOlli Huotari2012-08-201-2/+3
| | | | | | | | Fixed bug in the example code. A bit related to rails issue in  https://github.com/rails/rails/issues/3223
| * Make a doc example output in match actual outputEvan Farrar2012-08-151-4/+4
| | | | | | | | | | Make doc output in grouped_options_for_select divider example match actual output. The options groups were in backwards order of actual.
* | 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 [ci skip]
| * | 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#klass
| * | 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_escape
| * | | 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
| | | | | | | | | | | | | | | | | | | | These tests rely on "make_basic_app", which is a faster version that does not need to create the whole app directory structure.
* | | | Set eager load option in "make_basic_app" for railties testsCarlos Antonio da Silva2012-08-211-0/+1
| | | | | | | | | | | | | | | | Avoid output with config option not set when running some tests.
* | | | Merge pull request #7225 from rails/eager_loadJosé Valim2012-08-2133-109/+215
|\ \ \ \ | | | | | | | | | | Improve eager load on Rails
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new option allows any Ruby namespace to be registered and set up for eager load. We are effectively exposing the structure existing in Rails since v3.0 for all developers in order to make their applications thread-safe and CoW friendly.
| * | | | Make ActiveSupport::Autoload localJosé Valim2012-08-213-30/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, ActiveSupport::Autoload was global and reserved for usage inside Rails. This pull request makes it local, fixes its test (they were not being run because its file was named wrongly) and make it part of Rails public API.
| * | | | Remove allow_concurrency as a flagJosé Valim2012-08-215-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag was mainly used to add a Rack::Lock middleware to the stack, but the only scenario the lock is desired is in development. If you are deploying on a not-threaded server, the Rack::Lock does not provide any benefit since you don't have concurrent accesses. On the other hand, if you are on a threaded server, you don't want the lock, since it defeats the purpose of using a threaded server. If there is someone out there, running on a thread server and does want a lock, it can be added to your environment as easy as: `use Rack::Lock`
| * | | | Allow users to choose when to eager_load the application or not.José Valim2012-08-219-8/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the eager load behavior was mostly coupled to config.cache_classes, however this was suboptimal since in some environments a developer may want to cache classes but not necessarily load them all on boot (for example, test env). This pull request also promotes the use of config.eager_load set to true by default in production. In the majority of the cases, this is the behavior you want since it will copy most of your app into memory on boot (which was also the previous behavior). Finally, this fix a long standing Rails bug where it was impossible to access a model in a rake task when Rails was set as thread safe.
* | | | | 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 generator. [ci skip]
| * | | | | Clarify and correct the description for the --full option of the plugin_new ↵lazylester2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | generator
* | | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix for #5200
| * | | | | reset_counters() was crashing when there were multiple belongs_to ↵Dave Desrochers2012-08-218-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | associations with the same foreign key. This closes #5200.
* | | | | | 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 nil Closes #7404
| * | | | | 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 about column_types.
| * | | | | Refactor AR::Result or inherits. Because we have redundant codes aboutkennyj2012-08-223-18/+4
|/ / / / /