aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
| * Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
* | Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
|\ \
| * | Lock sprockets to 2.2.xGuillermo Iguaran2012-11-091-1/+1
| |/
* | Fix redirect example blockCarlos Antonio da Silva2012-11-091-3/+3
* | Merge pull request #8093 from nikitug/keep_app_x_ua_compatibleCarlos Antonio da Silva2012-11-083-1/+46
* | backport, handle trailing slash with enginesYves Senn2012-11-083-1/+11
* | Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tagRafael Mendonça França2012-11-083-1/+34
|/
* Clear url helpers when reloading routesSantiago Pastorino2012-11-022-0/+5
* Add test to avoid regression of 4a86362Rafael Mendonça França2012-11-021-0/+10
* Revert "Merge pull request #7668 from Draiken/fix_issue_6497"Rafael Mendonça França2012-11-023-18/+7
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
* Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased"Rafael Mendonça França2012-10-314-37/+14
* Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va...Rafael Mendonça França2012-10-303-23/+31
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
* Merge pull request #7865 from teleological/link_to_remote_3_2Rafael Mendonça França2012-10-063-1/+12
|\
| * Accept :remote as symbol in link_to optionsRiley2012-10-063-1/+12
* | Use the Ruby 1.8 hash syntaxRafael Mendonça França2012-10-061-1/+1
|/
* Merge pull request #7848 from senny/3415_assert_template_has_nil_variableRafael Mendonça França2012-10-063-3/+23
* Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variablesRafael Mendonça França2012-10-013-23/+29
* Merge pull request #7789 from senny/7777_resource_functions_modify_optionsRafael Mendonça França2012-10-013-2/+27
* Since File instance doesn't respond to #open use a double to test theRafael Mendonça França2012-09-303-5/+4
* Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. Bu...Jeremy Kemper2012-09-303-21/+27
* New CHANGELOG entries always in the top [ci skip]Rafael Mendonça França2012-09-301-6/+6
* Merge pull request #7659 from HugoLnx/template_error_no_matches_rebasedRafael Mendonça França2012-09-304-6/+55
* Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-09-293-1/+14
* Shush uninitialized @_layout warningJeremy Kemper2012-09-281-1/+1
* Revert "Revert "Respect `config.digest = false` for `asset_path`""Rafael Mendonça França2012-09-203-1/+20
* Revert "Respect `config.digest = false` for `asset_path`"Rafael Mendonça França2012-09-203-20/+1
* Merge pull request #7668 from Draiken/fix_issue_6497Rafael Mendonça França2012-09-193-1/+18
* Respect `config.digest = false` for `asset_path`Peter Wagenet2012-09-173-1/+20
* log 404 status when ActiveRecord::RecordNotFound was raised (#7646)Yves Senn2012-09-174-3/+27
* Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-08-282-1/+8
* CHANGELOGs are now per branchXavier Noria2012-08-281-5654/+1
* correct handling of date selects when using both disabled and discard optionsVasiliy Ermolovich2012-08-253-2/+34
* Merge pull request #7410 from sandeepravi/default_options_helper_valueRafael Mendonça França2012-08-213-0/+18
* Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redirect the ...Jeremy Kemper2012-08-152-2/+28
* Update changelog to reflect support of cookie jar options for allbrainopia2012-08-111-0/+5
* Test actual content of permanent cookiebrainopia2012-08-101-1/+1
* Dont stream back cookie value if it was set to the same valuebrainopia2012-08-102-5/+19
* Revert "Revert "Merge pull request #6084 from brainopia/support_for_magic_dom...brainopia2012-08-102-0/+14
* Merge branch '3-2-8' into 3-2-stableSantiago Pastorino2012-08-096-7/+27
|\
| * Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
| * Add release date to CHANGELOGsSantiago Pastorino2012-08-091-1/+1
| * Do not mark strip_tags result as html_safeSantiago Pastorino2012-08-093-3/+10
| * escape select_tag :prompt valuesSantiago Pastorino2012-08-093-2/+15
| * Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
| * html_escape should escape single quotesSantiago Pastorino2012-08-029-31/+31
* | Fix CHANGELOG [ci skip]Rafael Mendonça França2012-08-081-1/+4