aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8750 from tricknotes/remove-unnecessary-hCarlos Antonio da Silva2013-01-047-17/+17
|\
| * Remove unnecessary `ERB::Util::h`Ryunosuke SATO2013-01-057-17/+17
* | Merge pull request #8747 from asanghi/wsfixCarlos Antonio da Silva2013-01-042-4/+4
|\ \
| * | removed dangling whitespace in generated database ymlAditya Sanghi2013-01-042-4/+4
| |/
* | Merge pull request #8746 from tricknotes/remove-h-from-guidesCarlos Antonio da Silva2013-01-042-6/+6
|\ \ | |/ |/|
| * ERB::Util::h is no longer generated in scaffoldRyunosuke SATO2013-01-052-6/+6
|/
* Merge pull request #8744 from tricknotes/suppress-warningRafael Mendonça França2013-01-041-1/+1
|\
| * Suppress warning about IO#lines in Ruby 2.0Ryunosuke SATO2013-01-041-1/+1
|/
* Merge pull request #8739 from franckverrot/remove_activexobjectGuillermo Iguaran2013-01-041-6/+2
|\
| * Remove the fallback onto `ActiveXObject("Microsoft.XMLHTTP")`.Franck Verrot2013-01-041-6/+2
|/
* Merge pull request #8738 from amatsuda/frozen_railsGuillermo Iguaran2013-01-031-2/+2
|\
| * No such feature in Rails anymore. That's Bundler's businessAkira Matsuda2013-01-041-2/+2
* | Merge pull request #8736 from tricknotes/apply-varGuillermo Iguaran2013-01-031-1/+2
|\ \
| * | Apply `var` keyword to js at welcome#indexRyunosuke SATO2013-01-041-1/+2
* | | Merge pull request #8723 from goshakkk/refactor-error-pageGuillermo Iguaran2013-01-033-5/+27
|\ \ \ | |/ / |/| |
| * | move error page js into script tagGosha Arinich2013-01-043-5/+27
* | | Set the default timezone after the initialization since the configurationRafael Mendonça França2013-01-042-15/+27
* | | Refactor infinite comparable definition a bitCarlos Antonio da Silva2013-01-041-15/+19
* | | Remove unnecessary requiresRafael Mendonça França2013-01-031-2/+0
* | | Remove assert_nothing_raisedRafael Mendonça França2013-01-036-67/+49
* | | Merge pull request #7350 from slbug/date_time_ranges_with_infinite_boundsRafael Mendonça França2013-01-0317-7/+199
|\ \ \
| * | | Added ability to compare date/time with infinitybUg2013-01-0417-7/+199
|/ / /
* | | Use bundler --pre for travis buildsJeremy Kemper2013-01-031-1/+1
* | | Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs <gem>'Jeremy Kemper2013-01-031-1/+1
* | | Reuse the Column integer converterRafael Mendonça França2013-01-031-1/+1
* | | Change duplicated test nameRafael Mendonça França2013-01-031-2/+2
* | | Merge pull request #8734 from jstirk/master-column_writer_to_i_errorsRafael Mendonça França2013-01-034-8/+37
|\ \ \ | |_|/ |/| |
| * | Fix undefined method `to_i' introduced since 3.2.8Jason Stirk2013-01-044-8/+37
|/ /
* | Merge pull request #8732 from amatsuda/readme_call_yieldRafael Mendonça França2013-01-031-1/+1
|\ \
| * | no, call <%= yield %>Akira Matsuda2013-01-041-1/+1
|/ /
* | Merge pull request #8731 from amatsuda/readme_dir_treeGuillermo Iguaran2013-01-031-11/+15
|\ \
| * | update directory tree in the generated READMEAkira Matsuda2013-01-041-11/+15
* | | Add documentation to ActionDispatch::Http::UploadedFile#headersRafael Mendonça França2013-01-031-0/+1
* | | Merge pull request #8730 from robin850/masterRafael Mendonça França2013-01-032-3/+3
|\ \ \
| * | | Fix missing spaces before and after equal signs in method definitionsRobin Dupret2013-01-032-3/+3
* | | | Merge pull request #8729 from timraymond/help_message_for_install_scriptRafael Mendonça França2013-01-031-0/+5
|\ \ \ \
| * | | | Adding a usage message to install.rb scriptTim Raymond2013-01-031-0/+5
|/ / / /
* | | | Merge pull request #8728 from amatsuda/model_all_returns_a_relationRafael Mendonça França2013-01-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | need to to_a the Relation to execute SQL hereAkira Matsuda2013-01-041-1/+1
| |/ /
* | | Merge pull request #8727 from robin850/patch-2Rafael Mendonça França2013-01-031-1/+0
|\ \ \
| * | | Remove a useless TODO commentRobin Dupret2013-01-031-1/+0
|/ / /
* | | Merge pull request #8705 from amparo-luna/change_update_attributes_to_updateGuillermo Iguaran2013-01-0338-132/+181
|\ \ \
| * | | Add Changelog entry regarding update_attibutes being renamed to updateAmparo Luna + Guillermo Iguaran2013-01-031-0/+7
| * | | Updating default application templates to use update instead of update_attrib...Amparo Luna + Guillermo Iguaran2013-01-034-6/+6
| * | | Change guides to use update instead of update_attributesAmparo Luna + Guillermo Iguaran2013-01-037-19/+19
| * | | Change docs to use update instead of update_attributesAmparo Luna + Guillermo Iguaran2013-01-038-12/+12
| * | | Rename update_attributes method to update, keep update_attributes as an aliasAmparo Luna + Guillermo Iguaran2013-01-0319-95/+137
* | | | Merge pull request #8725 from mattdbridges/patch-2Guillermo Iguaran2013-01-031-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Typo and grammar fixes in the ActionPack CHANGELOGMatt Bridges2013-01-031-1/+1
|/ / /
* | | Merge pull request #8713 from goshakkk/better-error-pageGuillermo Iguaran2013-01-032-12/+10
|\ \ \