aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1186 from mitijain123/duplicable_testSantiago Pastorino2011-07-241-7/+12
|\ | | | | Duplicable test is looking fine now.
| * Duplicable test is looking fine now.Mitesh Jain2011-07-241-7/+12
|/
* Merge pull request #2239 from castlerock/scaffold_jquerySantiago Pastorino2011-07-241-0/+1
|\ | | | | fixing broken test as jquery-rails is included in application.js
| * Bringing back the jquery-rails. One test is dependent.Mitesh Jain2011-07-241-0/+1
|/
* 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 #2185 from castlerock/lazy_load_abstract_adapterAaron Patterson2011-07-232-3/+2
|\ | | | | lazy load ConnectionAdapters remove require.
| * lazy load ConnectionAdapters remove require.Vishnu Atrai2011-07-222-3/+2
| |
* | 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.
* | | simplify singleton_class? methodAaron Patterson2011-07-231-7/+1
| | |
* | | Merge pull request #2226 from dmathieu/perform_cachingAaron Patterson2011-07-231-0/+1
|\ \ \ | |/ / |/| | rake assets:precompile should always perform caching - Closes #2199
| * | rake assets:precompile should always perform caching - Closes #2199Damien Mathieu2011-07-241-0/+1
|/ /
* | Remove unused gems from GemfileSantiago Pastorino2011-07-231-4/+0
| |
* | Merge pull request #2221 from grzuy/masterSantiago Pastorino2011-07-232-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 Rodriguez2011-07-232-1/+8
|/ / | | | | | | | | | | initialized with Pathname Port from 3-1-stable
* | Merge pull request #2218 from guilleiguaran/avoid-map-chainingAaron Patterson2011-07-231-1/+1
|\ \ | | | | | | Remove unneccesary map chaining
| * | Remove unneccesary map chainingGuillermo Iguaran2011-07-231-1/+1
|/ /
* | Merge pull request #2217 from marcandre/fix_enumerableAaron Patterson2011-07-232-32/+74
|\ \ | | | | | | Fix enumerable
| * | Trivial optimization for Enumerable#each_with_objectMarc-Andre Lafortune2011-07-231-2/+2
| | |
| * | Insure that Enumerable#index_by, group_by, ... return EnumeratorsMarc-Andre Lafortune2011-07-232-1/+15
| | |
| * | Make Enumerable#many? iterate only over what is necessaryMarc-Andre Lafortune2011-07-232-3/+17
| | |
| * | Make Enumerable#many? not rely on #sizeMarc-Andre Lafortune2011-07-232-3/+3
| | |
| * | Test using generic Enumerables instead of arrays.Marc-Andre Lafortune2011-07-231-24/+38
| | |
| * | Make tests more preciseMarc-Andre Lafortune2011-07-231-14/+14
|/ /
* | registers the recent change to date multiparameter handling in the CHANGELOGXavier Noria2011-07-231-0/+5
| |
* | Merge pull request #2086 from amatsuda/date_multiparameter_nilXavier Noria2011-07-232-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 blankAkira Matsuda2011-07-152-27/+15
| | |
* | | Merge pull request #2198 from Karunakar/fixing_2168Santiago Pastorino2011-07-231-3/+3
|\ \ \ | | | | | | | | Improve rails:template undefined LOCATION variable error message fixed
| * | | Improve rails:template undefined LOCATION variable error message fixedRaghunadh2011-07-231-3/+3
| | | |
* | | | Merge pull request #2171 from arunagw/database-rake-1.9.2Santiago Pastorino2011-07-231-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 Agrawal2011-07-211-1/+2
| | | | | | | | | | | | | | | | | | | | having a bug with "Calling return within begin still executes else".
* | | | | Merge pull request #2193 from zhengjia/remove_ruby_prof_for_rubiniusSantiago Pastorino2011-07-231-4/+6
|\ \ \ \ \ | | | | | | | | | | | | only install ruby-prof for mri ruby
| * | | | | remove ruby-prof for rubinius in Gemfilezhengjia2011-07-221-4/+6
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2196 from arunagw/issue_713Santiago Pastorino2011-07-231-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Spliting the ouput of git ls-files for running tasks Fixes #713
| * | | | | For svn files also spilt requiredArun Agrawal2011-07-231-1/+1
| | | | | |
| * | | | | Spliting the ouput of git ls-files for running tasks Fixes #713Arun Agrawal2011-07-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #2195 from castlerock/command_line_informationSantiago Pastorino2011-07-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Small missing information added to command description. --help also works
| * | | | | Small missing information added to command description. --help also works ↵Bratish Goswami2011-07-231-1/+1
| | |/ / / | |/| | | | | | | | | | | | | like -h.
* | | | | checked all .rb files in the project tree for missing magic comments, one ↵Xavier Noria2011-07-232-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 Noria2011-07-232-0/+2
| | | | |
* | | | | Revert "notextile tag has been placed with ascii quotes"Xavier Noria2011-07-232-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: <notextile> is an internal tag This reverts commit 01040b5dc990e79052627451603feea0f149fe41.
* | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-2321-277/+439
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | little details seen while doing a pass through what's new in docrailsXavier Noria2011-07-235-20/+21
| | | | |
| * | | | minor refactor in the template guideVijay Dev2011-07-231-8/+4
| | | | |
| * | | | document the change in edge rails which makes a more strict check on the ↵Vijay Dev2011-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | arity of the dynamic finders
| * | | | corrected sentences to make them consistent in command line guideVijay Dev2011-07-231-2/+2
| | | | |
| * | | | minor corrections in caching guideVijay Dev2011-07-231-5/+4
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 23:18:51 +0000