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 #2185 from castlerock/lazy_load_abstract_adapter | Aaron Patterson | 2011-07-23 | 2 | -3/+2 | |
|\ \ | | | | | | | lazy load ConnectionAdapters remove require. | |||||
| * | | lazy load ConnectionAdapters remove require. | Vishnu Atrai | 2011-07-22 | 2 | -3/+2 | |
| | | | ||||||
* | | | 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. | |||||
* | | | | simplify singleton_class? method | Aaron Patterson | 2011-07-23 | 1 | -7/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2226 from dmathieu/perform_caching | Aaron Patterson | 2011-07-23 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / |/| | | | rake assets:precompile should always perform caching - Closes #2199 | |||||
| * | | | rake assets:precompile should always perform caching - Closes #2199 | Damien Mathieu | 2011-07-24 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Remove unused gems from Gemfile | Santiago Pastorino | 2011-07-23 | 1 | -4/+0 | |
| | | | ||||||
* | | | Merge pull request #2221 from grzuy/master | Santiago Pastorino | 2011-07-23 | 2 | -1/+8 | |
|\ \ \ | | | | | | | | | Fix ActiveSupport::Cache::FileStore#file_path_key does not work if initialized with Pathname | |||||
| * | | | Fix ActiveSupport::Cache::FileStore#file_path_key does not work if ↵ | Gonzalo Rodriguez | 2011-07-23 | 2 | -1/+8 | |
|/ / / | | | | | | | | | | | | | | | | initialized with Pathname Port from 3-1-stable | |||||
* | | | Merge pull request #2218 from guilleiguaran/avoid-map-chaining | Aaron Patterson | 2011-07-23 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Remove unneccesary map chaining | |||||
| * | | | Remove unneccesary map chaining | Guillermo Iguaran | 2011-07-23 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2217 from marcandre/fix_enumerable | Aaron Patterson | 2011-07-23 | 2 | -32/+74 | |
|\ \ \ | | | | | | | | | Fix enumerable | |||||
| * | | | Trivial optimization for Enumerable#each_with_object | Marc-Andre Lafortune | 2011-07-23 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Insure that Enumerable#index_by, group_by, ... return Enumerators | Marc-Andre Lafortune | 2011-07-23 | 2 | -1/+15 | |
| | | | | ||||||
| * | | | Make Enumerable#many? iterate only over what is necessary | Marc-Andre Lafortune | 2011-07-23 | 2 | -3/+17 | |
| | | | | ||||||
| * | | | Make Enumerable#many? not rely on #size | Marc-Andre Lafortune | 2011-07-23 | 2 | -3/+3 | |
| | | | | ||||||
| * | | | Test using generic Enumerables instead of arrays. | Marc-Andre Lafortune | 2011-07-23 | 1 | -24/+38 | |
| | | | | ||||||
| * | | | Make tests more precise | Marc-Andre Lafortune | 2011-07-23 | 1 | -14/+14 | |
|/ / / | ||||||
* | | | registers the recent change to date multiparameter handling in the CHANGELOG | Xavier Noria | 2011-07-23 | 1 | -0/+5 | |
| | | | ||||||
* | | | Merge pull request #2086 from amatsuda/date_multiparameter_nil | Xavier Noria | 2011-07-23 | 2 | -27/+15 | |
|\ \ \ | | | | | | | | | convert multiple Date parameters into a nil if any of its bits were blank | |||||
| * | | | convert multiple Date parameters into a nil if any of its bits were blank | Akira Matsuda | 2011-07-15 | 2 | -27/+15 | |
| | | | | ||||||
* | | | | Merge pull request #2198 from Karunakar/fixing_2168 | Santiago Pastorino | 2011-07-23 | 1 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | Improve rails:template undefined LOCATION variable error message fixed | |||||
| * | | | | Improve rails:template undefined LOCATION variable error message fixed | Raghunadh | 2011-07-23 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #2171 from arunagw/database-rake-1.9.2 | Santiago Pastorino | 2011-07-23 | 1 | -1/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | This conditions is required to work with database create task. 1.9.2 is h | |||||
| * | | | | | This conditions is required to work with database create task. 1.9.2 is ↵ | Arun Agrawal | 2011-07-21 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | having a bug with "Calling return within begin still executes else". | |||||
* | | | | | | Merge pull request #2193 from zhengjia/remove_ruby_prof_for_rubinius | Santiago Pastorino | 2011-07-23 | 1 | -4/+6 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | only install ruby-prof for mri ruby | |||||
| * | | | | | | remove ruby-prof for rubinius in Gemfile | zhengjia | 2011-07-22 | 1 | -4/+6 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #2196 from arunagw/issue_713 | Santiago Pastorino | 2011-07-23 | 1 | -2/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Spliting the ouput of git ls-files for running tasks Fixes #713 | |||||
| * | | | | | | For svn files also spilt required | Arun Agrawal | 2011-07-23 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Spliting the ouput of git ls-files for running tasks Fixes #713 | Arun Agrawal | 2011-07-23 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #2195 from castlerock/command_line_information | Santiago Pastorino | 2011-07-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Small missing information added to command description. --help also works | |||||
| * | | | | | | Small missing information added to command description. --help also works ↵ | Bratish Goswami | 2011-07-23 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | like -h. | |||||
* | | | | | | checked all .rb files in the project tree for missing magic comments, one ↵ | Xavier Noria | 2011-07-23 | 2 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 $_. | |||||
* | | | | | | adds a couple of missing magic comments [fixes #1374] | Xavier Noria | 2011-07-23 | 2 | -0/+2 | |
| | | | | | | ||||||
* | | | | | | Revert "notextile tag has been placed with ascii quotes" | Xavier Noria | 2011-07-23 | 2 | -6/+4 | |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Reason: <notextile> is an internal tag This reverts commit 01040b5dc990e79052627451603feea0f149fe41. | |||||
* | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-23 | 21 | -277/+439 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | little details seen while doing a pass through what's new in docrails | Xavier Noria | 2011-07-23 | 5 | -20/+21 | |
| | | | | | ||||||
| * | | | | minor refactor in the template guide | Vijay Dev | 2011-07-23 | 1 | -8/+4 | |
| | | | | | ||||||
| * | | | | document the change in edge rails which makes a more strict check on the ↵ | Vijay Dev | 2011-07-23 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | arity of the dynamic finders | |||||
| * | | | | corrected sentences to make them consistent in command line guide | Vijay Dev | 2011-07-23 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | minor corrections in caching guide | Vijay Dev | 2011-07-23 | 1 | -5/+4 | |
| | | | | | ||||||
| * | | | | grammatical changes | JudeArasu | 2011-07-22 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of git@github.com:lifo/docrails | JudeArasu | 2011-07-22 | 1 | -0/+4 | |
| |\ \ \ \ | ||||||
| | * | | | | alias added for rails generate guide | Vishnu Atrai | 2011-07-22 | 1 | -0/+2 | |
| | | | | | | ||||||
| | * | | | | alias added for rails runner guide | Vishnu Atrai | 2011-07-21 | 1 | -0/+2 | |
| | | | | | |