aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'master' of https://github.com/lifo/docrailsKen Ip2011-07-241-5/+5
| |\ \ \
| | * | | Added some context for rack apps, linked to the Rails on Rack guide.Jason Noble & Ralph Shnelvar2011-07-241-1/+1
| | | | |
| | * | | Clarified notes in 3.2 Creating the Blog ApplicationMike Howard2011-07-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed descriptino of Gemfile to add reference to Bundler Changed description of README to add 'You should edit ...' Changed description of Rakefile to reflect dynamic nature of Rakefile and point to app/lib/tasks/ as the place to add app-specific rake tasks.
| | * | | Changed wording of paragraph 2.1.1 Models to clarify table/modelMike Howard2011-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | relationship. changed wording 'one table ... corresponds to one model' to 'each table ...'
| * | | | Update "Getting Started" for Rails 3.1Ken Ip2011-07-241-2/+6
| |/ / / | | | | | | | | | | | | Add additional files generated by rails 3.1 generator.
| * | | Revert "Tests now require MySQL2 adapter in order to run"Xavier Noria2011-07-241-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: Setting up MySQL and Postgres needs installing servers and libraries that perhaps you don't need in your machine. We think fixing a bug in Active Support without running the suite of Active Record for all possible drivers is OK. That's why we explain first --without db, and after that we cover AR specifically. mysql2 is no different than mysql or pg in that sense. This reverts commit 50d5e0f7e8ab01f3e7b5cf806eb4f9348eeff363.
| * | | 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-2415-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | English to American English(according to Weber)
| * | | Changing Textile emphasis underscores to em tags; the link with underscores ↵Carol Nichols2011-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that follows is causing the emphasis underscores to be parsed incorrectly. This appears to be a bug with RedCloth; parsing with official Textile creates the HTML that I expect. I have filed ticket # 226 on RedCloth's lighthouse project and I will attempt to fix the problem with RedCloth. This commit is a workaround for the RedCloth bug that will give this guide the right formatting.
| * | | Changed several instances of British English to be American EnglishEvan Farrar2011-07-238-10/+10
| | | |
| * | | Replaced ‘ with ' in the guides.Evan Farrar2011-07-232-7/+7
| | | |
| * | | Tests now require MySQL2 adapter in order to runJoe Fiorini2011-07-231-11/+2
| | | |
| * | | now the documentation reflects the actual returned value for a missing ↵gnagno2011-07-231-1/+1
| | | | | | | | | | | | | | | | translation
* | | | 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