aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | fix env toggling, improve error page stylingGosha Arinich2013-01-032-12/+10
* | | | Merge pull request #8719 from pcasaretto/fix-actionview-doc-typoCarlos Antonio da Silva2013-01-031-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix typo on form_tag_helper.rbPaulo Luis Franchini Casaretto2013-01-031-1/+1
|/ / /
* | | Merge pull request #8717 from amatsuda/scaffold_controller_test_patchCarlos Antonio da Silva2013-01-033-5/+5
|\ \ \
| * | | test PATCH method for update action in generated scaffold controller test rat...Akira Matsuda2013-01-033-5/+5
* | | | Merge pull request #8715 from goshakkk/refactor-mapperCarlos Antonio da Silva2013-01-031-9/+4
|\ \ \ \
| * | | | refactor Routing::MapperGosha Arinich2013-01-031-9/+4
| | |/ / | |/| |
* | | | Merge pull request #8714 from utkarshkukreti/faster-gem-installCarlos Antonio da Silva2013-01-032-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Pass in `--local` when doing `gem install` for local gems.Utkarsh Kukreti2013-01-032-5/+5
|/ / /
* | | Merge pull request #8706 from steveklabnik/ip_precautionsRafael Mendonça França2013-01-021-3/+4
|\ \ \
| * | | Explain the possible precautionsAndre Arko2013-01-021-3/+4
|/ / /
* | | Merge pull request #7980 from steveklabnik/issue_7979Guillermo Iguaran2013-01-025-113/+166
|\ \ \
| * | | Restore original remote_ip algorithm.Andre Arko2013-01-025-113/+166
|/ / /
* | | Changelog improvements [ci skip]Carlos Antonio da Silva2013-01-023-4/+5
* | | missing changelog entry for #8682Akira Matsuda2013-01-021-0/+4
|/ /
* | Merge pull request #8697 from goshakkk/undupRafael Mendonça França2013-01-021-5/+3
|\ \
| * | remove another unnecessary dupGosha Arinich2013-01-021-5/+3
* | | CVE-2012-5664 options hashes should only be extracted if there are extra para...Aaron Patterson2013-01-021-0/+12
* | | Merge pull request #8701 from senny/8700_double_slash_with_trailing_slashRafael Mendonça França2013-01-023-7/+33
|\ \ \