aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* removes support for RJS in link_to_functionXavier Noria2011-04-132-68/+10
* jQuery is the new defaultXavier Noria2011-04-132-59/+71
* Aligning commentsMatt Duncan2011-04-131-1/+1
* Fixing distance_of_time_in_words range near 2 daysMatt Duncan2011-04-132-8/+8
* Merge branch 'master' into sprocketsJoshua Peek2011-04-1243-96/+551
|\
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-123-4/+7
| |\
| | * Added missing </tt>Oge Nnadi2011-04-111-1/+1
| | * removed :nodoc: from ActionController::MimeRespondsJo Liss2011-04-101-2/+2
| | * Merge branch 'master' of github.com:lifo/docrailsRyan Bigg2011-04-0525-76/+291
| | |\
| | * | Correct documentation on url_for. It doesn't call to_s, but rather to_paramRyan Bigg2011-04-051-1/+4
| * | | Change Object#either? to Object#among? -- thanks to @jamesarosen for the sugg...David Heinemeier Hansson2011-04-129-10/+10
| * | | Fix failing test case on masterPrem Sichanugrist2011-04-101-1/+1
| * | | Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-1112-16/+29
| * | | Make csrf_meta_tags use the tag helperJames Robinson2011-04-082-9/+9
| * | | Merge branch 'master' of github.com:rails/railsAaron Patterson2011-04-072-4/+4
| |\ \ \
| | * | | Cache flash nowSantiago Pastorino2011-04-071-1/+1
| | * | | Revert "Use freeze instead of close!"Santiago Pastorino2011-04-073-11/+14
| | * | | Revert "Eagerly load Signed and Permanent cookies"Santiago Pastorino2011-04-071-17/+10
| | * | | cookies hereSantiago Pastorino2011-04-071-3/+3
| | * | | Eagerly load Signed and Permanent cookiesSantiago Pastorino2011-04-071-10/+17
| | * | | Use freeze instead of close!Santiago Pastorino2011-04-063-14/+11
| * | | | many args does not make sense with the current implementation because of how ...Aaron Patterson2011-04-061-10/+0
| * | | | getting the flash hash under testAaron Patterson2011-04-062-0/+104
| * | | | favor composition over inheritance, have FlashHash delegate to a HashAaron Patterson2011-04-062-11/+44
| |/ / /
| * | | CookieJar should prefer composition over inheritanceAaron Patterson2011-04-061-6/+10
| * | | Delete useless argumentsSantiago Pastorino2011-04-061-6/+6
| * | | Delete useless env variableSantiago Pastorino2011-04-061-9/+3
| * | | Add tests to verify that signed and permanent cookies raises if someone triesSantiago Pastorino2011-04-061-0/+51
| * | | Make process reuse the env var passed as argumentSantiago Pastorino2011-04-062-5/+12
| * | | raise if someone tries to modify the cookies when it was already streamed bac...Santiago Pastorino2011-04-062-0/+63
| * | | Add ClosedError message to the initializerSantiago Pastorino2011-04-063-5/+10
| * | | do not return html safe strings from auto_linkAaron Patterson2011-04-052-7/+13
| * | | raise if someone tries to modify the flash when it was already streamed back ...Santiago Pastorino2011-04-052-1/+69
| | |/ | |/|
| * | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-0312-24/+31
| |\ \
| | * | s/ERb/ERB/g (part II)Akira Matsuda2011-04-031-2/+2
| | * | s/ERb/ERB/gAkira Matsuda2011-04-037-12/+12
| | * | Trivial fix to HTTP Digest auth MD5 exampleJon Cooper2011-03-311-1/+1
| | * | Explain in the method doc that you need to call respond_to at the class level...Amaia Castro2011-03-311-0/+3
| | |/
| | * Fix grammar, formatting, and cross referencesJohn Firebaugh2011-03-281-8/+8
| | * Add docs for ActionController::Metal class methodsGabriel Horner2011-03-281-1/+5
| * | Bump up erubis to 2.7.0Santiago Pastorino2011-04-021-1/+1
| * | Implicit actions named not_implemented can be renderedSantiago Pastorino2011-04-023-2/+15
| * | Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-021-2/+0
| * | Improve docs.José Valim2011-03-311-0/+31
| * | pass respond_with options to controller render when using a template for api ...Josh Kalderimis2011-03-315-5/+25
| * | only try to display an api template in responders if the request is a get or ...Josh Kalderimis2011-03-313-4/+31
| * | when using respond_with with an invalid resource and custom options, the defa...Josh Kalderimis2011-03-312-1/+19
* | | Unify sprockets config optionsJoshua Peek2011-03-301-1/+1
* | | Merge branch 'master' into sprocketsJoshua Peek2011-03-3024-62/+344
|\| |
| * | use assert_equal so we get normal error messages along with our custom failur...Aaron Patterson2011-03-301-3/+3