aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
|\ \ \
| * | | do not append a second slash when usingYves Senn2013-01-023-7/+33
| |/ /
* | | Fixing closing </p>Guillermo Iguaran2013-01-021-1/+1
* | | Merge pull request #8702 from rubys/masterGuillermo Iguaran2013-01-022-8/+7
|\ \ \
| * | | Fix a number of validation/style errors:Sam Ruby2013-01-022-8/+7
|/ / /
* | | take into account multipart when calculating tag attributesAaron Patterson2013-01-021-4/+7
* | | ask the form builder for form tag attributesAaron Patterson2013-01-021-2/+3
* | | do not mutate the options hash (when we do not need to)Aaron Patterson2013-01-021-2/+2
|/ /
* | Merge pull request #8694 from goshakkk/undupCarlos Antonio da Silva2013-01-021-2/+1
|\ \
| * | remove unnecessary #dupGosha Arinich2013-01-021-2/+1
* | | Merge pull request #8688 from goshakkk/error-page-toggleGuillermo Iguaran2013-01-022-3/+7
|\ \ \ | |/ / |/| |
| * | allow toggling dumps instead of just showingGosha Arinich2013-01-022-3/+7
* | | Merge pull request #8693 from goshakkk/flattenRafael Mendonça França2013-01-021-2/+2
|\ \ \ | |_|/ |/| |
| * | replace #flatten with Array()Gosha Arinich2013-01-021-2/+2
* | | Merge pull request #8692 from lucasmazza/error-page-cssRafael Mendonça França2013-01-021-12/+13
|\ \ \
| * | | Cleanup some unnecessary CSS on the new error page and reformat some lines.Lucas Mazza2013-01-021-12/+13
| |/ /
* | | Merge pull request #8691 from acapilleri/preload_associationRafael Mendonça França2013-01-021-1/+3
|\ \ \ | |/ / |/| |
| * | refactoring to_sym of Symbol in preloadAngelo capilleri2013-01-021-1/+3
* | | Merge pull request #8689 from goshakkk/error-pageRafael Mendonça França2013-01-021-0/+4
|\ \ \
| * | | add source line paddingGosha Arinich2013-01-021-0/+4
| | |/ | |/|
* / | No need to pass a empty block to content_tag_for anymoreRafael Mendonça França2013-01-021-11/+11
|/ /
* | Make content_tag_for work without blockRafael Mendonça França2013-01-023-1/+17
* | Merge pull request #8686 from mekishizufu/changelog_entryXavier Noria2013-01-021-0/+4
|\ \ | |/ |/|
| * Add missing changelog entry for #8676 [ci skip]Jiri Pospisil2013-01-021-0/+4
|/
* Merge pull request #8682 from amatsuda/rm_as_frozen_object_errorGuillermo Iguaran2013-01-017-12/+4
|\
| * remove meaningless AS::FrozenObjectErrorAkira Matsuda2013-01-027-12/+4
* | Standardize the use of current_adapter?Rafael Mendonça França2013-01-019-19/+19
* | Merge pull request #8678 from yahonda/remove_column_oracleRafael Mendonça França2013-01-011-2/+3
|\ \
| * | Address a failure test_remove_column_with_multi_column_index with Oracle data...Yasuo Honda2013-01-021-2/+3
| |/
* | Merge pull request #8677 from amatsuda/unused_scope_in_test_modelsRafael Mendonça França2013-01-011-2/+0
|\ \ | |/ |/|
| * unused scopeAkira Matsuda2013-01-021-2/+0
|/
* Add entry in Releases Notes about changes in exceptions pageGuillermo Iguaran2013-01-011-0/+2
* Add CHANGELOG entry for changes in exception pagesGuillermo Iguaran2013-01-011-0/+6
* update rake tasks output [ci skip]Vijay Dev2013-01-011-1/+1
* fix alignment in rails info properties page [ci skip]Vijay Dev2013-01-011-0/+2
* Merge pull request #8676 from mekishizufu/skip_bundle_aliasJosé Valim2013-01-011-1/+1
|\
| * Add -B alias for --skip-bundleJiri Pospisil2013-01-011-1/+1
|/
* Merge pull request #8675 from goshakkk/cleanupJosé Valim2013-01-011-1/+1
|\
| * remove unnecessary always-nil var from #compactGosha Arinich2013-01-011-1/+1
|/