Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2233 from gramos/fix-issue-1951-master | Aaron Patterson | 2011-07-23 | 2 | -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 Ramos | 2011-07-24 | 2 | -3/+17 |
| | | | | | | | | fix issues/1951 | ||||
| * | - added test case for issue: | Gaston Ramos | 2011-07-24 | 1 | -0/+14 |
| | | | | | | | | | | https://github.com/rails/rails/issues/1951 Namespaced model partial_path is wrong in namespaced controllers | ||||
* | | just use normal ruby for stubbing | Aaron Patterson | 2011-07-23 | 1 | -5/+3 |
|/ | |||||
* | Merge pull request #2228 from Empact/helper_tags_in_mailers | Aaron Patterson | 2011-07-23 | 2 | -1/+2 |
|\ | | | | | Simple fix to the NoMethodError noted in #2177. | ||||
| * | Simple fix to the NoMethodError noted in #2177. | Ben Woosley | 2011-07-23 | 2 | -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 #2199 | Damien Mathieu | 2011-07-24 | 1 | -0/+1 |
|/ | |||||
* | checked all .rb files in the project tree for missing magic comments, one ↵ | Xavier Noria | 2011-07-23 | 1 | -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/docrails | Xavier Noria | 2011-07-23 | 3 | -71/+95 |
|\ | |||||
| * | little details seen while doing a pass through what's new in docrails | Xavier Noria | 2011-07-23 | 2 | -7/+7 |
| | | |||||
| * | use the doc conventions for arguments in all cases | Ray Baxter | 2011-07-20 | 1 | -3/+3 |
| | | | | | | | | | | See https://github.com/lifo/docrails/commit/5c71a4e76897844ab6aeabb581549d981d9768c9#commitcomment-485675 | ||||
| * | Update form helper documentation to match code. | Paul Battley | 2011-07-19 | 1 | -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 Dev | 2011-07-20 | 1 | -3/+3 |
| | | | | | | | | passed | ||||
| * | minor corrections in form helpers guide and api docs | Vijay Dev | 2011-07-20 | 1 | -2/+2 |
| | | |||||
| * | examples for telephone_field, url_field and email_field | Ray Baxter | 2011-07-17 | 1 | -0/+12 |
| | | |||||
| * | document options to search_field | Ray Baxter | 2011-07-17 | 1 | -1/+22 |
| | | |||||
| * | use correct in description | Ray Baxter | 2011-07-17 | 1 | -1/+1 |
| | | |||||
| * | we're talking about days here, not hours | Ray Baxter | 2011-07-17 | 1 | -1/+1 |
| | | |||||
| * | wording between select_second, select_minute and | Ray Baxter | 2011-07-17 | 1 | -2/+2 |
| | | | | | | select_hour should be consistent and correct | ||||
| * | fix typo | Ray Baxter | 2011-07-17 | 1 | -1/+1 |
| | | |||||
| * | make documentation agree with test expectations and | Ray Baxter | 2011-07-17 | 1 | -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 default | Ray Baxter | 2011-07-16 | 1 | -1/+1 |
| | | |||||
| * | there is no Time.today method, use Time.now | Ray Baxter | 2011-07-16 | 1 | -2/+2 |
| | | |||||
| * | remove stray character | Ray Baxter | 2011-07-16 | 1 | -1/+1 |
| | | |||||
| * | disambiguate uses of post/POST by using "article" | Ray Baxter | 2011-07-16 | 1 | -28/+28 |
| | | | | | | | | for the related variable passed to date_select, time_select and datetime_select | ||||
| * | clarify that classes that include DateHelper can | Ray Baxter | 2011-07-16 | 1 | -2/+2 |
| | | | | | | also manipulate times | ||||
| * | clarify that DateTime objects are allowed arguments | Ray Baxter | 2011-07-16 | 1 | -1/+1 |
| | | | | | | to distance_of_time_in_words | ||||
| * | use minute instead of second in description of select_minute | Ray Baxter | 2011-07-16 | 1 | -2/+2 |
| | | |||||
| * | show correct helper in description | Ray Baxter | 2011-07-16 | 1 | -1/+1 |
| | | |||||
| * | use 'hour' instead of 'minutes' and 'second' for select_hour | Ray Baxter | 2011-07-16 | 1 | -2/+2 |
| | | |||||
| * | Revert "Fix wildcard route code examples." | Vijay Dev | 2011-07-15 | 1 | -2/+2 |
| | | | | | | | | | | | | This reverts commit 0894d73c7552a4c7d576b7d3692c6a18faadd273. Reason: CHANGELOGs should not be changed in docrails. | ||||
| * | Fix wildcard route code examples. | Hendy Tanata | 2011-07-15 | 1 | -2/+2 |
| | | | | | | | | Should be "match" instead of "map". | ||||
| * | Documentation fixes for rendering partials | Olek Janiszewski | 2011-07-09 | 1 | -20/+11 |
| | | |||||
* | | use rake tasks to set the default environment variables. fixes #2126 | Aaron Patterson | 2011-07-21 | 1 | -10/+10 |
| | | |||||
* | | Check Accept and Content-Type headers before evaluating them in xhr ↵ | ogeidix | 2011-07-19 | 2 | -1/+8 |
| | | | | | | | | | | | | requests. Closes #2119 An xhr request must have an "Accept" or "Content-type" header in order to be considered a request with valid_accept_header. | ||||
* | | add entry for submit helper change removing object_name_id | Vijay Dev | 2011-07-20 | 1 | -0/+2 |
| | | |||||
* | | Ensure that status codes are logged properly | Jesse Storimer | 2011-07-18 | 2 | -4/+23 |
| | | | | | | | | | | | | Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue so that status codes rendered from rescue_from blocks are logged properly. | ||||
* | | make tzinfo a development dependency | Aaron Patterson | 2011-07-18 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #2124 from arunagw/render_partial_invalid_check_fix | Santiago Pastorino | 2011-07-17 | 1 | -2/+1 |
|\ \ | | | | | | | Checking with to_s. As regexp fail with 1.8.7 | ||||
| * | | Checking with to_s. As regexp fail with 1.8.7 | Arun Agrawal | 2011-07-18 | 1 | -2/+1 |
| | | | |||||
* | | | Don't do remove_possible_method when delegate is used. Two reasons: 1) ↵ | Jon Leighton | 2011-07-18 | 1 | -1/+2 |
|/ / | | | | | | | warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937. | ||||
* | | Merge pull request #2046 from sikachu/master-test_fix | Santiago Pastorino | 2011-07-17 | 1 | -2/+6 |
|\ \ | | | | | | | Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a | ||||
| * | | Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to ↵ | Prem Sichanugrist | 2011-07-17 | 1 | -2/+6 |
| | | | | | | | | | | | | be in its method | ||||
* | | | Merge pull request #2018 from bhus/render_partial_invalid_check | Santiago Pastorino | 2011-07-17 | 3 | -0/+16 |
|\ \ \ | |/ / |/| | | Render partial invalid check | ||||
| * | | Added view template invalid name check, along with tests. No merges in commit. | huskins | 2011-07-13 | 3 | -0/+16 |
| | | | |||||
* | | | indeed, if we are going to remove everything in public/assets on ↵ | Xavier Noria | 2011-07-17 | 1 | -4/+1 |
| | | | | | | | | | | | | assets:clean, just do that | ||||
* | | | if we are cleaning all files, we are cleaning all gz files | Xavier Noria | 2011-07-17 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #2082 from htanata/rake_routes_formatting | Santiago Pastorino | 2011-07-16 | 1 | -7/+7 |
|\ \ \ | | | | | | | | | Better formatting of rake routes (issue #1991) | ||||
| * | | | Better formatting of route requirements in rake:routes. | Hendy Tanata | 2011-07-16 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was: {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/} Now it becomes: photos#show {:id=>/[A-Z]\d{5}/} | ||||
* | | | | Fix wildcard route code example in changelog. | Hendy Tanata | 2011-07-16 | 1 | -2/+2 |
|/ / / |