aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* use sprocket's append_path and assert_matchDamien Mathieu2011-07-261-26/+26
|
* use_sprockets is not used anymoreSantiago Pastorino2011-07-261-5/+1
|
* Bump sprockets upSantiago Pastorino2011-07-261-1/+1
|
* Bump rack up. Closes #2107Santiago Pastorino2011-07-251-1/+1
|
* Merge pull request #2262 from sferik/format_trueJosé Valim2011-07-252-0/+9
|\ | | | | Allow a route to have :format => true
| * Allow a route to have :format => trueErik Michaels-Ober2011-07-252-0/+9
| | | | | | | | | | | | When format is true, it is mandatory (as opposed to :format => false). This is currently not possible with resource routes, which automatically make format optional by default.
* | Remove unused use_sprockets configSantiago Pastorino2011-07-252-8/+1
|/
* Merge pull request #2245 from ↵Santiago Pastorino2011-07-252-6/+25
|\ | | | | | | | | davidtrogers/constraints_block_passed_to_following_routes_in_same_scope Memoizing @blocks & disposing of constraints options properly
| * Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-252-6/+25
| | | | | | | | | | addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints.
* | no need for an anonymous class on every setup callAaron Patterson2011-07-251-10/+9
| |
* | Merge pull request #2258 from thedarkone/no-file-statJosé Valim2011-07-252-3/+3
|\ \ | | | | | | Use shorter class-level File methods instead of going through File.stat
| * | Use shorter class-level File methods instead of going through File.stat.thedarkone2011-07-252-3/+3
| |/
* / Make polymorphic_url calls go through application helpers again.thedarkone2011-07-253-9/+14
|/ | | | This brings back the ability to overwrite/extend url generating methods in application heleprs.
* Merge pull request #2243 from dmathieu/commentXavier Noria2011-07-241-0/+1
|\ | | | | Help the next guy with explanations - See bb3b3e306
| * help the next guy with explanations - See bb3b3e306Damien Mathieu2011-07-241-0/+1
| |
* | Use top level Rails constantAndrew White2011-07-241-2/+2
| |
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-247-11/+11
|\ \ | |/ |/|
| * Missed a few instances of British English spelling in the last commitOemuer Oezkir2011-07-243-3/+3
| | | | | | | | oh and obviously I meant according to Webster, not Weber
| * Changed a few instances of of words in the API docs written in British ↵Oemuer Oezkir2011-07-246-10/+10
| | | | | | | | | | | | English to American English(according to Weber)
| * now the documentation reflects the actual returned value for a missing ↵gnagno2011-07-231-1/+1
| | | | | | | | translation
* | Merge pull request #2233 from gramos/fix-issue-1951-masterAaron Patterson2011-07-232-2/+30
|\ \ | | | | | | Fix issue 1951 master Namespaced model partial_path is wrong in namespaced controllers
| * | - added ActionView::PartialRenderer#merge_path_into_partial(path, partial)Gaston Ramos2011-07-242-3/+17
| | | | | | | | | | | | fix issues/1951
| * | - added test case for issue:Gaston Ramos2011-07-241-0/+14
| | | | | | | | | | | | | | | https://github.com/rails/rails/issues/1951 Namespaced model partial_path is wrong in namespaced controllers
* | | just use normal ruby for stubbingAaron Patterson2011-07-231-5/+3
|/ /
* | Merge pull request #2228 from Empact/helper_tags_in_mailersAaron Patterson2011-07-232-1/+2
|\ \ | | | | | | Simple fix to the NoMethodError noted in #2177.
| * | Simple fix to the NoMethodError noted in #2177.Ben Woosley2011-07-232-1/+2
| | | | | | | | | Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.
* | | rake assets:precompile should always perform caching - Closes #2199Damien Mathieu2011-07-241-0/+1
|/ /
* / checked all .rb files in the project tree for missing magic comments, one ↵Xavier Noria2011-07-231-0/+2
|/ | | | | | | | | | | | | | was missing Came with this one-liner for this: find . -name '*.rb' | \ xargs chardet | \ grep -v ascii | \ cut -d: -f1 -s | \ xargs -n1 ruby -0777 -ne 'puts $FILENAME if $_ !~ /#.*coding:\s*utf/i' Welcome $_.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-233-71/+95
|\
| * little details seen while doing a pass through what's new in docrailsXavier Noria2011-07-232-7/+7
| |
| * use the doc conventions for arguments in all casesRay Baxter2011-07-201-3/+3
| | | | | | | | | | See https://github.com/lifo/docrails/commit/5c71a4e76897844ab6aeabb581549d981d9768c9#commitcomment-485675
| * Update form helper documentation to match code.Paul Battley2011-07-191-2/+2
| | | | | | | | Change d3cfee11 removed the automatically generated object_name_submit id attributes on form submit elements. This makes the documentation match.
| * reword select_date's behaviour clearly when an incomplete options array is ↵Vijay Dev2011-07-201-3/+3
| | | | | | | | passed
| * minor corrections in form helpers guide and api docsVijay Dev2011-07-201-2/+2
| |
| * examples for telephone_field, url_field and email_fieldRay Baxter2011-07-171-0/+12
| |
| * document options to search_fieldRay Baxter2011-07-171-1/+22
| |
| * use correct in descriptionRay Baxter2011-07-171-1/+1
| |
| * we're talking about days here, not hoursRay Baxter2011-07-171-1/+1
| |
| * wording between select_second, select_minute andRay Baxter2011-07-171-2/+2
| | | | | | select_hour should be consistent and correct
| * fix typoRay Baxter2011-07-171-1/+1
| |
| * make documentation agree with test expectations andRay Baxter2011-07-171-2/+2
| | | | | | | | | | | | behaviour See: test_select_date_with_incomplete_order in actionpack/test/template/date_helper_test.rb
| * document that second tags are also returned by defaultRay Baxter2011-07-161-1/+1
| |
| * there is no Time.today method, use Time.nowRay Baxter2011-07-161-2/+2
| |
| * remove stray characterRay Baxter2011-07-161-1/+1
| |
| * disambiguate uses of post/POST by using "article"Ray Baxter2011-07-161-28/+28
| | | | | | | | for the related variable passed to date_select, time_select and datetime_select
| * clarify that classes that include DateHelper canRay Baxter2011-07-161-2/+2
| | | | | | also manipulate times
| * clarify that DateTime objects are allowed arguments Ray Baxter2011-07-161-1/+1
| | | | | | to distance_of_time_in_words
| * use minute instead of second in description of select_minuteRay Baxter2011-07-161-2/+2
| |
| * show correct helper in descriptionRay Baxter2011-07-161-1/+1
| |
| * use 'hour' instead of 'minutes' and 'second' for select_hourRay Baxter2011-07-161-2/+2
| |