Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | ERB::Util::h is no longer generated in scaffold | Ryunosuke SATO | 2013-01-05 | 2 | -6/+6 | |
| | | ||||||
* | | Merge pull request #8705 from amparo-luna/change_update_attributes_to_update | Guillermo Iguaran | 2013-01-03 | 6 | -18/+18 | |
|\ \ | | | | | | | Rename update_attributes method to update | |||||
| * | | Change guides to use update instead of update_attributes | Amparo Luna + Guillermo Iguaran | 2013-01-03 | 6 | -18/+18 | |
| | | | ||||||
* | | | Restore original remote_ip algorithm. | Andre Arko | 2013-01-02 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | | | | | | | | | | | Proxy servers add X-Forwarded-For headers, resulting in a list of IPs. We remove trusted IP values, and then take the last given value, assuming that it is the most likely to be the correct, unfaked value. See [1] for a very thorough discussion of why that is the best option we have at the moment. [1]: http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection/ Fixes #7979 | |||||
* | | Add entry in Releases Notes about changes in exceptions page | Guillermo Iguaran | 2013-01-01 | 1 | -0/+2 | |
| | | ||||||
* | | update rake tasks output [ci skip] | Vijay Dev | 2013-01-01 | 1 | -1/+1 | |
| | | ||||||
* | | small fix in js guide [ci skip] | Vijay Dev | 2013-01-01 | 1 | -1/+1 | |
|/ | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-01-01 | 5 | -8/+29 | |
|\ | ||||||
| * | Merge pull request #123 from m-o/master | Vijay Dev | 2013-01-01 | 1 | -1/+1 | |
| |\ | | | | | | | Fixed typo one line in layouts and rendering: stylesheet_link_tag for file in subdirectory. | |||||
| | * | Update guides/source/layouts_and_rendering.md | Marek Ovečka | 2012-12-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | Removed first slash. The subdirectory will nto be found with slash befor it. | |||||
| * | | Improve English | Ruafozy | 2013-01-01 | 1 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | * Fix one error * Improve wording * Improve punctuation | |||||
| * | | Update guides/source/rails_on_rack.md | Jonathan Baudanza | 2012-12-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | Rack::Lock actually sets rack.multithread to `false`, not `true`. Presumably because once inside the mutex, the app can function as if it were single threaded. | |||||
| * | | fixed inconsistent `require 'test_helper'` in testing guide | Joey Schoblaska | 2012-12-30 | 1 | -1/+1 | |
| |/ | ||||||
| * | Update documentation for yml usage | Nishant Modak | 2012-12-30 | 1 | -1/+1 | |
| | | | | | | Update documentation for yml usage against https://github.com/rails/rails/issues/8612 | |||||
| * | Document JoinTable migration generator | Sammy Larbi | 2012-12-29 | 1 | -0/+19 | |
| | | ||||||
* | | Add note on the contributing guide to not use the refute methods | Rafael Mendonça França | 2012-12-31 | 1 | -2/+3 | |
| | | ||||||
* | | Merge pull request #8647 from nishantmodak/patch-2 | Vijay Dev | 2012-12-29 | 1 | -1/+1 | |
|\ \ | | | | | | | Update documentation for yml usage | |||||
| * | | Update documentation for yml usage | Nishant Modak | 2012-12-30 | 1 | -1/+1 | |
| |/ | ||||||
* / | Fix up/down column change example code formatting | Sammy Larbi | 2012-12-29 | 1 | -1/+1 | |
|/ | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-29 | 2 | -5/+1 | |
|\ | ||||||
| * | Revert "reminder to run bundle after setting up rails-dev-box" | Vijay Dev | 2012-12-29 | 1 | -7/+0 | |
| | | | | | | | | | | | | | | | | | | This reverts commit 41381c19d1f3920ee9540aff0d35209cb43fb057. Reason: This doesn't quite fit the flow where it's added. Let's add this someplace else if it's explicitly required. [ci skip] | |||||
| * | Fixed couple of typos | Fabrizio Regini | 2012-12-27 | 1 | -1/+1 | |
| | | ||||||
| * | removed TIP: :allow_nil/:allow_blank is ignored by the presence validator | Colin Kelley | 2012-12-26 | 1 | -4/+0 | |
| | | | | | | | | These tips were documenting an inconsistency issue https://github.com/rails/rails/issues/8621. That issue is resolved by https://github.com/rails/rails/issues/8622. | |||||
| * | reminder to run bundle after setting up rails-dev-box | Ace Suares | 2012-12-24 | 1 | -0/+7 | |
| | | ||||||
* | | Note about migration timestamps. | Steve Klabnik | 2012-12-26 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | We should mention that the ordering matters with regards to timestamps, and not imply that it's just for uniqueness purposes. Closes #8610. | |||||
* | | replace AS::BufferedLogger doc mentions with AS::Logger | Yves Senn | 2012-12-25 | 3 | -5/+5 | |
| | | ||||||
* | | Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵ | Jeremy Kemper | 2012-12-21 | 3 | -37/+0 | |
| | | | | | | | | with Rails 4.0. | |||||
* | | Merge pull request #8267 from marcandre/reversible_drop_table_etc | Aaron Patterson | 2012-12-21 | 2 | -36/+202 | |
|\ \ | | | | | | | Reversible commands | |||||
| * | | Update Migration and 4.0 Release Guides, Changelogs [#8267] | Marc-Andre Lafortune | 2012-12-21 | 2 | -36/+202 | |
| |/ | ||||||
* | | Updated security guide to reference secret_key_base instead of secret_token, ↵ | Gary S. Weaver | 2012-12-21 | 1 | -3/+3 | |
| | | | | | | | | with a little information about the change from CookieStore to EncryptedCookieStore. | |||||
* | | Updated security guide with information about secret_token.rb and to suggest ↵ | Gary S. Weaver | 2012-12-21 | 1 | -7/+11 | |
|/ | | | | securing sensitive files like database.yml and secret_token.rb | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-21 | 1 | -20/+38 | |
|\ | ||||||
| * | copy edits in assets guide [ci skip] | Vijay Dev | 2012-12-21 | 1 | -23/+26 | |
| | | ||||||
| * | Explain controller specific assets more thoroughly | Damian Galarza | 2012-12-17 | 1 | -17/+32 | |
| | | | | | | | | | | | | | | | | | | The current section on controller specific assets does not really explain how the default application.css and application.js files generated by rails will work with controller specific assets and is a bit ambiguous. We should remind users that they will be included into their application by default but that they have the option to include them only where needed if they want and how this works with precompiling assets. [ci_skip] | |||||
* | | Restored 'Working with Validation Errors' | Steve Klabnik | 2012-12-16 | 1 | -0/+140 | |
| | | | | | | | | | | Somehow this got lost in my PRs before. I'm going to re-check all the guides to make sure this didn't happen again elsewhere. | |||||
* | | make an editing pass through the upgrading guide [ci skip] | Vijay Dev | 2012-12-15 | 1 | -30/+16 | |
|/ | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-15 | 10 | -175/+16 | |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb railties/lib/rails/info_controller.rb | |||||
| * | copy editing [ci skip] | Vijay Dev | 2012-12-15 | 2 | -2/+2 | |
| | | ||||||
| * | Elaborate using `inverse_of` with presence validation | Jay Hayes | 2012-12-13 | 1 | -1/+2 | |
| | | ||||||
| * | Fix associations presence lost in steve's reformat | Jay Hayes | 2012-12-13 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | https://github.com/lifo/docrails/commit/55a2820cc6d33e96b8d1b64b38b033913058dce4 messes up https://github.com/lifo/docrails/commit/cfd324b4b68469ba3188e4b7ba8586e59b239693 Hopefully there is other stuff lost in translation... | |||||
| * | Add a small note about the compressing the file, and how that helps the ↵ | Anuj Dutta | 2012-12-13 | 1 | -1/+2 | |
| | | | | | | | | application. | |||||
| * | Add #destroy! as a method that triggers callbacks | Pablo Torres | 2012-12-12 | 1 | -0/+1 | |
| | | ||||||
| * | Remove deprecated Time methods from the guides [ci skip] | Pablo Torres | 2012-12-11 | 1 | -22/+2 | |
| | | | | | | | | | | | | | | Don't use: * Time.time_with_datetime_fallback * Time.utc_time * Time.local_time | |||||
| * | Update guides/source/routing.md | George Claghorn | 2012-12-11 | 1 | -1/+1 | |
| | | | | | | It's no longer necessary to delete public/index.html for the root route to take effect. | |||||
| * | remove attr_protected reference from AS Core Extensions guide [ci skip] | Francesco Rodriguez | 2012-12-10 | 1 | -7/+0 | |
| | | ||||||
| * | remove Mass Assignment reference from Form Helpers guide [ci skip] | Francesco Rodriguez | 2012-12-10 | 1 | -1/+1 | |
| | | ||||||
| * | remove Mass Assignment reference from Security Guide [ci skip] | Francesco Rodriguez | 2012-12-10 | 1 | -1/+0 | |
| | | ||||||
| * | Document adding member route without the option | Florent Guilleux | 2012-12-10 | 1 | -1/+3 | |
| | | ||||||
| * | Add multipart: true to form for file upload. | Steve Klabnik | 2012-12-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | I was slightly overzealous when removing this before. Identified here: https://github.com/rails/rails/commit/ed78770b1a13788a5d3fcae484f34654de580bd5\#commitcomment-2281181 | |||||
| * | `config.action_mailer.async` is no longer used | Andy Lindeman | 2012-12-10 | 1 | -1/+0 | |
| | |