aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixing English in Rails::Engine docsGeorge Millo2015-04-231-17/+26
* 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
|/ /
* | Merge pull request #19819 from gazay/no_fork_issueRafael Mendonça França2015-04-221-4/+4
|\ \
| * | MRI compatible code for ActiveSupport::Testing::Isolation::SubprocessAlexey Gaziev2015-04-191-4/+4
* | | Merge pull request #19833 from cllns/fix-scaffolding-spacingRafael Mendonça França2015-04-221-0/+2
|\ \ \
| * | | Add blank lines between divs in form scaffoldingSean Collins2015-04-201-0/+2
| | |/ | |/|
* | | Merge pull request #19779 from jonatack/improve-contributing-to-ruby-on-rails...Zachary Scott2015-04-211-13/+20
|\ \ \
| * | | Improve the Contributing to Rails Guide [skip ci]Jon Atack2015-04-161-13/+20
* | | | Merge pull request #19847 from fertapric/activemodel-dirty-after-save-syntact...Rafael Mendonça França2015-04-213-2/+43
|\ \ \ \
| * | | | Add `ActiveModel::Dirty#[attr_name]_previously_changed?` andFernando Tapia Rico2015-04-213-2/+43
* | | | | Merge pull request #19846 from y-yagi/update_ruby_versionRafael Mendonça França2015-04-211-1/+1
|\ \ \ \ \
| * | | | | update Ruby required version in Getting Started guide [ci skip]yuuji.yaginuma2015-04-221-1/+1
|/ / / / /
* | | | | Merge pull request #19842 from yui-knk/fix/ruby_versionZachary Scott2015-04-211-1/+1
|\ \ \ \ \
| * | | | | [ci skip] Update `current version of Ruby`yui-knk2015-04-211-1/+1
| |/ / / /
* / / / / Rename association option :class to :anonymous_classAndrew White2015-04-219-25/+31
|/ / / /
* | | | Merge pull request #19839 from yui-knk/fix/guide2Yves Senn2015-04-211-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | [ci skip] Fix linked html fileyui-knk2015-04-211-1/+1
|/ / /
* | | capitalize titleXavier Noria2015-04-201-1/+1
* | | Merge pull request #19822 from y-yagi/correct_generic_template_linkGodfrey Chan2015-04-201-1/+1
|\ \ \
| * | | correct link to Generic template [ci skip]yuuji.yaginuma2015-04-201-1/+1
|/ / /
* | | Implicitly skip spring for `rails new --dev`Godfrey Chan2015-04-202-1/+9
* | | Consistency: Rails master -> edge Rails [ci skip]Godfrey Chan2015-04-201-1/+1
* | | Fix typos in contributing guide [ci skip]Godfrey Chan2015-04-191-2/+2
* | | Merge pull request #19821 from chancancode/bug_report_templates_guideZachary Scott2015-04-191-9/+13
|\ \ \
| * | | Better explain the bug report templates [ci skip]Godfrey Chan2015-04-191-9/+13
|/ / /
* | | Only *configure* the queue in setup; DB creation must come laterMatthew Draper2015-04-202-21/+25
* | | Shuffle a few things in aid of easier debuggingMatthew Draper2015-04-201-20/+36
* | | Fix sidekiq test order dependencyMatthew Draper2015-04-202-2/+3