Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "added .DS_Store to .gitignore" | Vijay Dev | 2012-09-01 | 1 | -1/+0 |
| | | | | | | This reverts commit fc80ebb13328eb5f233f65408ba281bf0f8ce68e. Such changes aren't allowed in docrails. | ||||
* | reverting changes from commit b0896c38 | Sven Kraeuter | 5v3n | 2012-09-01 | 1 | -1/+1 |
| | |||||
* | Fix comment about Session. | Steve Klabnik | 2012-08-31 | 1 | -1/+1 |
| | | | | SessionHash isn't a thing, and tenses are wrong. | ||||
* | Fix my bio | Pratik Naik | 2012-08-31 | 1 | -1/+1 |
| | |||||
* | Merge pull request #111 from 5v3n/master | Sven Kräuter | 2012-08-31 | 1 | -1/+1 |
|\ | | | | | Fixed little mistake in the docs | ||||
| * | there is no "delete" action in a controller | Sven Kräuter | 2012-08-31 | 1 | -1/+1 |
|/ | |||||
* | In example about params naming conventions use params[:person] [ci skip] | Aldo "xoen" Giambelluca | 2012-08-31 | 1 | -1/+1 |
| | | | | | | The example is about a Person model, say that "params[:model] would usually be a hash of all the attributes for the person to create" could be confusing. I changed to params[:person] since the example is about a Person creation. | ||||
* | Merge pull request #106 from neilstockbridge/master | Jeff Shantz | 2012-08-30 | 1 | -1/+1 |
|\ | | | | | Added a bullet for :enable_starttls_auto in the smtp_settings table | ||||
| * | Added a note for smtp_settings.enable_starttls_auto | Neil Stockbridge | 2012-08-08 | 1 | -1/+1 |
| | | |||||
* | | in section 4.1 acts_as_yaffle_test was incorrectly failing due to assertion ↵ | Kevin Musiorski | 2012-08-30 | 1 | -2/+2 |
| | | | | | | | | incorrectly using symbol instead of string | ||||
* | | added .DS_Store to .gitignore | Kevin Musiorski | 2012-08-30 | 1 | -0/+1 |
| | | |||||
* | | Added example of using options_for_select() with select_tag() | Kir Shatrov | 2012-08-30 | 1 | -0/+4 |
| | | |||||
* | | Removed spaces between name and asterisks in example CHANGELOG entry [ci skip] | Aldo "xoen" Giambelluca | 2012-08-30 | 1 | -1/+1 |
| | | |||||
* | | Expand documentation for change() method in Time, Date, and DateTime | Jeff Shantz | 2012-08-29 | 3 | -4/+15 |
| | | |||||
* | | Revert "Grammar" | Jo Liss | 2012-08-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Per https://github.com/lifo/docrails/commit/e94e8d8c3fcac624466afcf61f6a118abe5a6af4#commitcomment-1784677 Thanks @randomecho! This reverts commit e94e8d8c3fcac624466afcf61f6a118abe5a6af4. | ||||
* | | Grammar | Jo Liss | 2012-08-29 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #110 from nmadura/master | Nathaniel Madura | 2012-08-29 | 1 | -0/+3 |
|\ \ | | | | | | | minor update to asset_pipeline docs describing apache config | ||||
| * | | added a touch more information to the apache configuration instructions | Nathaniel Madura | 2012-08-29 | 1 | -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_clarifications | Jim Jones | 2012-08-28 | 1 | -1/+19 |
|\ \ | | | | | | | Added clairifications for default security headers. | ||||
| * | | Added clairifications for default security headers. | Jim Jones | 2012-08-27 | 1 | -1/+19 |
|/ / | |||||
* | | Merge pull request #108 from homakov/master | Egor Homakov | 2012-08-27 | 1 | -0/+23 |
|\ \ | | | | | | | Default headers description | ||||
| * | | default headers init | Egor Homakov | 2012-08-27 | 1 | -0/+23 |
|/ / | |||||
* | | Update guides/source/rails_application_templates.textile | Deepak Kannan | 2012-08-27 | 1 | -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 command | Deepak Kannan | 2012-08-27 | 1 | -1/+1 |
| | | | | | | | | | | after running, git add . do not need -a option to git commit | ||||
* | | Guide: improvements to "The Flash" section. | Henrik N | 2012-08-25 | 1 | -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/master | Xavier Noria | 2012-08-24 | 1 | -8/+13 |
|\ \ | | | | | | | Fix rake guides:validate | ||||
| * | | Add exception handling to rake guides:validate | Jaime Iniesta | 2012-08-24 | 1 | -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:validate | Jaime Iniesta | 2012-08-24 | 1 | -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 Iniesta | 2012-08-24 | 1 | -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/docrails | Almudena Garcia | 2012-08-23 | 1 | -8/+13 |
|\ \ | |||||
| * | | Fix rake guides:validate task as it should be run from the guides directory; ↵ | Jaime Iniesta | 2012-08-23 | 1 | -8/+13 |
| | | | | | | | | | | | | add exception handling | ||||
* | | | Fix HTML validation errors | Almudena Garcia | 2012-08-23 | 4 | -7/+7 |
|/ / | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-08-22 | 2 | -19/+18 |
|\ \ | |||||
| * | | giving a pause usually made for e.g. in sentences [ci skip] | Soon Van | 2012-08-21 | 1 | -15/+14 |
| | | | |||||
| * | | Revert "association_basics, updated how inverse_of works" | Rafael Mendonça França | 2012-08-20 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | This reverts commit 8cb9460437eddde6952fbebbc969203cd4d00294. Reason: #7377 was merged and it fixes this behavior. | ||||
| * | | association_basics, updated how inverse_of works | Olli Huotari | 2012-08-20 | 1 | -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 output | Evan Farrar | 2012-08-15 | 1 | -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_token | Carlos Antonio da Silva | 2012-08-22 | 1 | -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 Ong | 2012-08-21 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge pull request #6606 from amatsuda/ar_relation_model_method | Rafael Mendonça França | 2012-08-21 | 2 | -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#klass | Akira Matsuda | 2012-06-03 | 2 | -0/+6 |
| | | | | |||||
* | | | | Add CHANGELOG entry for #3578 [ci skip] | Rafael Mendonça França | 2012-08-21 | 2 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #3578 from amatsuda/remove_j_alias_for_json_escape | Rafael Mendonça França | 2012-08-21 | 1 | -7/+0 |
|\ \ \ \ | | | | | | | | | | | Remove j alias for ERB::Util.json_escape | ||||
| * | | | | Remove j alias for ERB::Util.json_escape | Akira Matsuda | 2011-11-09 | 1 | -7/+0 |
| | | | | | |||||
* | | | | | Remove app building setup/teardown for remote ip railtie tests | Carlos Antonio da Silva | 2012-08-21 | 1 | -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 tests | Carlos Antonio da Silva | 2012-08-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Avoid output with config option not set when running some tests. | ||||
* | | | | | Merge pull request #7225 from rails/eager_load | José Valim | 2012-08-21 | 33 | -109/+215 |
|\ \ \ \ \ | | | | | | | | | | | | | Improve eager load on Rails | ||||
| * | | | | | add Rack::Lock for webrick | Aaron Patterson | 2012-08-21 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Deprecate config.threadsafe! | José Valim | 2012-08-21 | 4 | -22/+20 |
| | | | | | | |||||
| * | | | | | Get rid of config.preload_frameworks in favor of config.eager_load_namespaces | José Valim | 2012-08-21 | 23 | -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. |