aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* copy edits [ci skip]Vijay Dev2012-09-012-4/+2
|
* Revert "added .DS_Store to .gitignore"Vijay Dev2012-09-011-1/+0
| | | | | | This reverts commit fc80ebb13328eb5f233f65408ba281bf0f8ce68e. Such changes aren't allowed in docrails.
* reverting changes from commit b0896c38Sven Kraeuter | 5v3n2012-09-011-1/+1
|
* Fix comment about Session.Steve Klabnik2012-08-311-1/+1
| | | | SessionHash isn't a thing, and tenses are wrong.
* Fix my bioPratik Naik2012-08-311-1/+1
|
* Merge pull request #111 from 5v3n/masterSven Kräuter2012-08-311-1/+1
|\ | | | | Fixed little mistake in the docs
| * there is no "delete" action in a controllerSven Kräuter2012-08-311-1/+1
|/
* In example about params naming conventions use params[:person] [ci skip]Aldo "xoen" Giambelluca2012-08-311-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/masterJeff Shantz2012-08-301-1/+1
|\ | | | | Added a bullet for :enable_starttls_auto in the smtp_settings table
| * Added a note for smtp_settings.enable_starttls_autoNeil Stockbridge2012-08-081-1/+1
| |
* | in section 4.1 acts_as_yaffle_test was incorrectly failing due to assertion ↵Kevin Musiorski2012-08-301-2/+2
| | | | | | | | incorrectly using symbol instead of string
* | added .DS_Store to .gitignoreKevin Musiorski2012-08-301-0/+1
| |
* | Added example of using options_for_select() with select_tag()Kir Shatrov2012-08-301-0/+4
| |
* | Removed spaces between name and asterisks in example CHANGELOG entry [ci skip]Aldo "xoen" Giambelluca2012-08-301-1/+1
| |
* | 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
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-18 21:23:13 +0000