aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix comment about Session.Steve Klabnik2012-08-311-1/+1
* Fix my bioPratik Naik2012-08-311-1/+1
* Merge pull request #111 from 5v3n/masterSven Kräuter2012-08-311-1/+1
|\
| * 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
* Merge pull request #106 from neilstockbridge/masterJeff Shantz2012-08-301-1/+1
|\
| * 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 i...Kevin Musiorski2012-08-301-2/+2
* | 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
* | GrammarJo Liss2012-08-291-3/+3
* | Merge pull request #110 from nmadura/masterNathaniel Madura2012-08-291-0/+3
|\ \
| * | added a touch more information to the apache configuration instructionsNathaniel Madura2012-08-291-0/+3
|/ /
* | Merge pull request #109 from aantix/default_security_headers_clarificationsJim Jones2012-08-281-1/+19
|\ \
| * | 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 initEgor Homakov2012-08-271-0/+23
|/ /
* | Update guides/source/rails_application_templates.textileDeepak Kannan2012-08-271-1/+1
* | Minor update for usage of git commandDeepak Kannan2012-08-271-1/+1
* | Guide: improvements to "The Flash" section.Henrik N2012-08-251-9/+22
* | Merge pull request #107 from jaimeiniesta/masterXavier Noria2012-08-241-8/+13
|\ \
| * | Add exception handling to rake guides:validateJaime Iniesta2012-08-241-1/+6
| * | Fix rake guides:validateJaime Iniesta2012-08-241-7/+7
|/ /
* | Revert "Fix rake guides:validate task as it should be run from the guides dir...Jaime Iniesta2012-08-241-13/+8
* | 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
* | | 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
| * | 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