aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Expand)AuthorAgeFilesLines
* Add changelog entry for jsonp mimetype change, fix failing testCarlos Antonio da Silva2012-04-291-1/+1
* Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-291-2/+40
* Merge pull request #2321 from omjokine/masterJosé Valim2012-04-291-1/+1
|\
| * Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-0174-429/+1708
| |\
| * | fixed test case test_render_json_with_callback to use content_type applicatio...Olli Jokinen2011-07-281-1/+1
* | | Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-281-0/+17
* | | Merge session arg with existing session instead of overwritingAndrew White2012-04-281-0/+20
* | | remove calls to deprecated find(:first) in actionpack test suiteSergey Nartimov2012-04-261-2/+2
* | | Fix the buildYehuda Katz2012-04-251-1/+2
* | | Merge pull request #5980 from gazay/valid_ipsJeremy Kemper2012-04-251-20/+114
|\ \ \
| * | | Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ...Alexey Gaziev2012-04-251-20/+114
* | | | Remove default match without specified methodJose and Yehuda2012-04-2439-341/+341
* | | | Use leap years trick in distance_of_time_in_words only for distances between ...Alexey Vakhov2012-04-241-0/+2
* | | | fixed non matching documentation behaviour with method semantics on distance_...Marcelo Casiraghi2012-04-241-2/+19
* | | | Distance of time in words should work correct if from time > to_timeAlexey Vakhov2012-04-241-0/+1
|/ / /
* | | Merge pull request #5865 from tiegz/minor_fixesAaron Patterson2012-04-201-34/+21
|\ \ \
| * | | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-161-39/+17
| * | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-161-0/+9
* | | | Remove unused test code.Rafael Mendonça França2012-04-161-5/+0
|/ / /
* | | Merge pull request #5746 from jmbejar/index_method_form_builderSantiago Pastorino2012-04-111-0/+50
|\ \ \
| * | | Add index method to FormBuilder. Useful when you use field_for and need to kn...Jorge Bejar2012-04-111-0/+50
* | | | Adding itemscope to list of boolean attributes.Frankie Roberto2012-04-091-2/+2
* | | | Merge pull request #5783 from rafaelfranca/default_url_optionsSantiago Pastorino2012-04-082-2/+2
|\ \ \ \
| * | | | default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-082-2/+2
* | | | | Revert "Merge pull request #5750 from ahoward/master"Santiago Pastorino2012-04-081-18/+0
|/ / / /
* | | | Merge pull request #5748 from ai/no_type_in_html5Jeremy Kemper2012-04-085-104/+104
|\ \ \ \
| * | | | Remove unnecessary in HTML 5 type attribute with default valueAndrey A.I. Sitnik2012-04-055-104/+104
* | | | | Make url_for work when option is nil and default_url_options hasRafael Mendonça França2012-04-051-0/+9
* | | | | Merge pull request #5750 from ahoward/masterAaron Patterson2012-04-051-0/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | carefully and quickly merge url_for optionsara.t.howard2012-04-041-0/+9
| |/ / /
* | | | Merge pull request #4446 from ayamomiji/patch-1José Valim2012-04-051-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | prevent the cache sweeper ignores NoMethodErrorayaya2012-03-291-0/+7
* | | | add type option to atom feed entry builderSergey Nartimov2012-04-011-0/+31
* | | | Merge pull request #5691 from avakhov/form-label-blockJosé Valim2012-04-011-0/+14
|\ \ \ \
| * | | | Block version of label should wrapped in field_with_errors in case of errorAlexey Vakhov2012-04-011-0/+14
* | | | | Tests :if option of force_ssl methodAlexey Vakhov2012-04-011-0/+23
|/ / / /
* | | | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-301-0/+7
* | | | Merge pull request #5625 from nertzy/prefix_partial_path_with_controller_name...José Valim2012-03-284-10/+63
|\ \ \ \
| * | | | Make controller namespace partial prefix optionalGrant Hutchins2012-03-284-6/+59
| * | | | Test that render gets correct exact template nameGrant Hutchins2012-03-281-4/+4
| |/ / /
* | | | Merge pull request #5359 from avakhov/missed-commits-from-3-2-stableSantiago Pastorino2012-03-282-1/+27
|\ \ \ \ | |/ / / |/| | |
| * | | datetime_select should work with -/+ infinity datesJoe Van Dyk2012-03-281-0/+12
| * | | Add a test case for layout nil.José Valim2012-03-281-1/+15
* | | | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-281-0/+1
|/ / /
* | | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-281-0/+7
* | | config.action_view.embed_authenticity_token_in_remote_forms is true by defaultPiotr Sarnacki2012-03-281-19/+14
* | | Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-281-2/+48
* | | Add test for default_url_options[:port]Aaron Suggs2012-03-281-0/+12
* | | Merge pull request #5621 from rafaelfranca/fix-2492-masterJeremy Kemper2012-03-271-0/+34
|\ \ \
| * | | Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-271-6/+18