aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* :put_litter_in_its_place: Unused methodAkira Matsuda2015-04-251-6/+0
* Why do we add a top-level constant here?Akira Matsuda2015-04-252-9/+5
* Do not show --helper and --assets options in the controller generator helpAkira Matsuda2015-04-251-1/+2
* Merge pull request #19894 from thenickcox/deprecated_proxy_docsZachary Scott2015-04-241-22/+38
|\
| * [ci skip] Rework docs, add examples on deprecation proxiesNick Cox2015-04-241-22/+38
* | Merge pull request #19236 from sshaw/more_tagged_logging_docsYves Senn2015-04-242-1/+4
|\ \
| * | Refer to the constructer argument in docsSkye Shaw2015-04-241-1/+1
| * | More docs on tagged logging [ci skip]sshaw2015-03-062-1/+4
* | | Merge pull request #19888 from imtayadeway/tw/attribute-methods-docsClaudio B.2015-04-241-7/+7
|\ \ \
| * | | Fix grammar/style: assigns/declares -> assignments/declarations.Tim Wade2015-04-241-3/+3
| * | | Fix grammar/style: use (v) fall back (on).Tim Wade2015-04-241-1/+1
| * | | Fix grammar/style: break up long sentence.Tim Wade2015-04-241-2/+2
| * | | Fix grammar/style: pluralize 'each of its method'Tim Wade2015-04-241-1/+1
| | |/ | |/|
* | | use a more descriptive example. [ci skip]Yves Senn2015-04-241-6/+4
* | | docs for `create_table` and non-int primary keys. [ci skip]Yves Senn2015-04-241-0/+17
|/ /
* | Merge pull request #19881 from sikachu/silence-mysql-errno-warningRafael Mendonça França2015-04-231-1/+3
|\ \
| * | Silence warning from MySQL::Error object in testPrem Sichanugrist2015-04-231-1/+3
|/ /
* | Merge pull request #19879 from bboe/RedirectTestCleanupRafael Mendonça França2015-04-231-3/+0
|\ \
| * | Remove unused WorkshopsController class in redirect_test.Bryce Boe2015-04-231-3/+0
* | | Remove nonexistent adapterRafael Mendonça França2015-04-231-1/+0
* | | Add nodoc to some private constants [ci skip]Rafael Mendonça França2015-04-231-3/+3
* | | Merge pull request #19823 from sbhatore/doc_fix_1Rafael Mendonça França2015-04-231-0/+8
|\ \ \ | |/ / |/| |
| * | Squashed commit of the following:Siddharth Bhatore2015-04-231-0/+8
* | | Merge pull request #18880 from mudge/timestamp-index-bugRafael Mendonça França2015-04-233-0/+20
|\ \ \
| * | | Fix missing index when using timestamps with indexPaul Mucur2015-04-153-0/+24
* | | | Merge pull request #19875 from cllns/fix-css-formatting-in-welcome-indexRafael Mendonça França2015-04-231-3/+10
|\ \ \ \
| * | | | Fix CSS formatting in welcome#index.html.erbSean Collins2015-04-231-3/+10
|/ / / /
* | | | Merge pull request #19872 from Ecco/masterYves Senn2015-04-231-1/+1
|\ \ \ \
| * | | | Fix a minor grammatical issue in the docRomain Goyet2015-04-231-1/+1
* | | | | Merge pull request #19870 from thenickcox/action_dispatch_mw_docsRichard Schneeman2015-04-231-6/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ci skip] Add, clean up docs in ActionDispatch ActionDispatch middlewareNick Cox2015-04-221-6/+13
|/ / / /
* | | | Queue Classic runs a second earlier than scheduledMatthew Draper2015-04-231-1/+1
* | | | Require yaml before trying to rescue its exception classRafael Mendonça França2015-04-221-1/+1
* | | | Remove sqlite support from `rails dbconsole`Andrew White2015-04-223-9/+4
* | | | Merge pull request #19862 from piton4eg/patch-2Rafael Mendonça França2015-04-221-2/+2
|\ \ \ \
| * | | | Fix find_each options [ci skip]Alexey Markov2015-04-221-2/+2
|/ / / /
* | | | Don't ask something that we don't want toRafael Mendonça França2015-04-221-1/+1
* | | | Merge pull request #17333 from rails/encode-twz-tzinfo-in-yamlAndrew White2015-04-225-8/+76
|\ \ \ \
| * | | | Improve ActiveSupport::TimeWithZone conversion to YAMLAndrew White2015-04-225-8/+76
* | | | | Merge pull request #19858 from cllns/fix-scaffolding-css-formattingRafael Mendonça França2015-04-221-7/+20
|\ \ \ \ \
| * | | | | Fix formatting of scaffold cssSean Collins2015-04-221-7/+20
* | | | | | Merge pull request #19857 from sikachu/remove-alias-method-chain-docRafael Mendonça França2015-04-221-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Clearify that alias_method_chain is deprecatedPrem Sichanugrist2015-04-221-0/+3
* | | | | | Refactor ActiveSupport::Timezone#strptimeAndrew White2015-04-222-28/+44
* | | | | | Add ActiveSupport::TimeZone#strptime.Paul A Jungwirth2015-04-223-0/+90
* | | | | | Merge pull request #19856 from sikachu/silence-mathn-warningRafael Mendonça França2015-04-221-1/+1
|\ \ \ \ \ \
| * | | | | | Silence warning from requiring mathnPrem Sichanugrist2015-04-221-1/+1
| |/ / / / /
* | | | | | Merge pull request #19852 from sbhatore/doc_fix_cookiesSantiago Pastorino2015-04-221-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ci skip] UpgradeLegacySignedCookieJar Doc fixSiddharth Bhatore2015-04-221-2/+2
* | | | | | pass over CHANGELOGs. [ci skip]Yves Senn2015-04-226-20/+24
|/ / / / /