aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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 ↵Santiago Pastorino2011-04-062-0/+63
| | | | | | | | | | | | | | | | back to the client or converted to HTTP headers
| * | | 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
| | |/ | |/| | | | | | | to the client or converted to HTTP headers
| * | 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
| | | | | | | | | | | | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html
| | * | 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 ↵Amaia Castro2011-03-311-0/+3
| | |/ | | | | | | | | | level in order to use respond_with.
| | * 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
| | | | | | | | | | | | | | | | | | navigation Signed-off-by: José Valim <jose.valim@gmail.com>
| * | only try to display an api template in responders if the request is a get or ↵Josh Kalderimis2011-03-313-4/+31
| | | | | | | | | | | | | | | | | | there are no errors Signed-off-by: José Valim <jose.valim@gmail.com>
| * | when using respond_with with an invalid resource and custom options, the ↵Josh Kalderimis2011-03-312-1/+19
| | | | | | | | | | | | | | | | | | default response status and error messages should be returned Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Unify sprockets config optionsJoshua Peek2011-03-301-1/+1
| | |
* | | Merge branch 'master' into sprocketsJoshua Peek2011-03-3024-62/+344
|\| | | | | | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb
| * | use assert_equal so we get normal error messages along with our custom ↵Aaron Patterson2011-03-301-3/+3
| | | | | | | | | | | | failure message
| * | Make action_method? public and change implicit rendering to override it instead.José Valim2011-03-303-19/+25
| | |
| * | Pass the proper method_name instead of hardcoding to action_name.José Valim2011-03-292-9/+11
| | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/implicit_render.rb
| * | Dont call authenticate_or_request_with_http_basic twiceDavid Heinemeier Hansson2011-03-291-4/+2
| | |
| * | Remove 'warning: ambiguous first argument' when running ActionPack testsSebastian Martinez2011-03-292-4/+4
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Move mapper_test to the appropriate locationPrem Sichanugrist2011-03-291-0/+0
| | | | | | | | | | | | | | | | | | It seems like in 89c5b9aee7d7db95cec9e5a934c3761872ab107e Aaron actually put the test in action_dispatch folder. However, there's already a `test/dispatch` directory which I think it's more appropriate. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * | Update the wildcard route to be non-greedy by default, therefore be able to ↵Prem Sichanugrist2011-03-294-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | match the (.:format) segment [#6605 state:resolved] After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * | Fix examplesDavid Heinemeier Hansson2011-03-282-2/+2
| | |
| * | Added Base.http_basic_authenticate_with to do simple http basic ↵David Heinemeier Hansson2011-03-283-14/+69
| |/ | | | | | | authentication with a single class method call [DHH]
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-271-7/+6
| |\
| | * Proc objects for cache_path for caches_action no longer need controller ↵Ryan Bigg2011-03-261-7/+6
| | | | | | | | | | | | object, nor to use send when calling routing helpers
| * | Add controller-specific `force_ssl` method to force web browser to use HTTPS ↵Prem Sichanugrist2011-03-285-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | protocol This would become useful for site which sometime transferring sensitive information such as account information on particular controller or action. This featured was requested by DHH.
| * | fixes a couple of regexps, the suite showed warnings about themXavier Noria2011-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of things worth mentioning here: - "{" is a metacharacter, should be escaped if it is meant to match a "{". The code worked, though, because the regexp engine is tolerant to this, but issued warnings. - gsub accepts a string as first argument. That's the best idiom to use when your pattern has no metacharacters, since gsub interprets the string as an exact substring to look for, rather than a regexp. The benefit is that your pattern is crystal clear and needs no backslashes.
| * | Fix alias_method, add testDavid Heinemeier Hansson2011-03-272-1/+2
| | |
| * | Allow FormHelper#form_for to specify the :method as a direct option instead ↵David Heinemeier Hansson2011-03-263-4/+36
| | | | | | | | | | | | of through the :html hash [DHH]
| * | Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() ↵David Heinemeier Hansson2011-03-262-0/+7
| |/ | | | | | | -- note this then supersedes the Object#j() method that the JSON gem adds within templates using the JavaScriptHelper [DHH]
| * correction to the outputted controller name in the diagnostics error ↵Josh Kalderimis2011-03-242-1/+17
| | | | | | | | | | | | template, test included Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Merge branch 'master' into sprocketsJoshua Peek2011-03-306-2/+45
|\|
| * Fix filter :only and :except with implicit actionsAndrew White2011-03-232-12/+17
| | | | | | | | | | | | | | The method_name argument is "default_render" for implicit actions so use the action_name attribute to determine which callbacks to run. [#5673 state:resolved]
| * Add a failing test case for an implicit action with a before filter.Manfred Stienstra2011-03-233-0/+24
| | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-231-0/+7
| |\
| | * doc :anchor option for #match in routesGabriel Horner2011-03-151-0/+7
| | |
| * | Do not show optional (.:format) block for wildcard route [#6605 state:resolved]Prem Sichanugrist2011-03-222-1/+8
| | | | | | | | | | | | This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default
* | | Seperate asset directoriesJoshua Peek2011-03-298-16/+21
| | |
* | | Rename option to config.asset_pipelineJoshua Peek2011-03-291-1/+1
| | |
* | | Change back to /assets prefixJoshua Peek2011-03-291-2/+2
| | |
* | | Only add fingerprints if perform_caching is onJoshua Peek2011-03-291-1/+1
| | |
* | | Copy use_sprockets configJoshua Peek2011-03-292-2/+3
| | |
* | | Use sprockets helpers if config.use_sprockets is setJoshua Peek2011-03-292-6/+22
| | |