Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #17333 from rails/encode-twz-tzinfo-in-yaml | Andrew White | 2015-04-22 | 5 | -8/+76 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Improve ActiveSupport::TimeWithZone conversion to YAML | Andrew White | 2015-04-22 | 5 | -8/+76 | |
* | | | | | | | | | Merge pull request #19858 from cllns/fix-scaffolding-css-formatting | Rafael Mendonça França | 2015-04-22 | 1 | -7/+20 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix formatting of scaffold css | Sean Collins | 2015-04-22 | 1 | -7/+20 | |
* | | | | | | | | | | Merge pull request #19857 from sikachu/remove-alias-method-chain-doc | Rafael Mendonça França | 2015-04-22 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Clearify that alias_method_chain is deprecated | Prem Sichanugrist | 2015-04-22 | 1 | -0/+3 | |
* | | | | | | | | | | Refactor ActiveSupport::Timezone#strptime | Andrew White | 2015-04-22 | 2 | -28/+44 | |
* | | | | | | | | | | Add ActiveSupport::TimeZone#strptime. | Paul A Jungwirth | 2015-04-22 | 3 | -0/+90 | |
* | | | | | | | | | | Merge pull request #19856 from sikachu/silence-mathn-warning | Rafael Mendonça França | 2015-04-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Silence warning from requiring mathn | Prem Sichanugrist | 2015-04-22 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #19852 from sbhatore/doc_fix_cookies | Santiago Pastorino | 2015-04-22 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | [ci skip] UpgradeLegacySignedCookieJar Doc fix | Siddharth Bhatore | 2015-04-22 | 1 | -2/+2 | |
* | | | | | | | | | | pass over CHANGELOGs. [ci skip] | Yves Senn | 2015-04-22 | 6 | -20/+24 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #19819 from gazay/no_fork_issue | Rafael Mendonça França | 2015-04-22 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | MRI compatible code for ActiveSupport::Testing::Isolation::Subprocess | Alexey Gaziev | 2015-04-19 | 1 | -4/+4 | |
* | | | | | | | | | | Merge pull request #19833 from cllns/fix-scaffolding-spacing | Rafael Mendonça França | 2015-04-22 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add blank lines between divs in form scaffolding | Sean Collins | 2015-04-20 | 1 | -0/+2 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #19779 from jonatack/improve-contributing-to-ruby-on-rails... | Zachary Scott | 2015-04-21 | 1 | -13/+20 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Improve the Contributing to Rails Guide [skip ci] | Jon Atack | 2015-04-16 | 1 | -13/+20 | |
* | | | | | | | | | | | Merge pull request #19847 from fertapric/activemodel-dirty-after-save-syntact... | Rafael Mendonça França | 2015-04-21 | 3 | -2/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add `ActiveModel::Dirty#[attr_name]_previously_changed?` and | Fernando Tapia Rico | 2015-04-21 | 3 | -2/+43 | |
* | | | | | | | | | | | | Merge pull request #19846 from y-yagi/update_ruby_version | Rafael Mendonça França | 2015-04-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | update Ruby required version in Getting Started guide [ci skip] | yuuji.yaginuma | 2015-04-22 | 1 | -1/+1 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #19842 from yui-knk/fix/ruby_version | Zachary Scott | 2015-04-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | [ci skip] Update `current version of Ruby` | yui-knk | 2015-04-21 | 1 | -1/+1 | |
| |/ / / / / / / / / / / | ||||||
* / / / / / / / / / / / | Rename association option :class to :anonymous_class | Andrew White | 2015-04-21 | 9 | -25/+31 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #19839 from yui-knk/fix/guide2 | Yves Senn | 2015-04-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | [ci skip] Fix linked html file | yui-knk | 2015-04-21 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | capitalize title | Xavier Noria | 2015-04-20 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #19822 from y-yagi/correct_generic_template_link | Godfrey Chan | 2015-04-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | correct link to Generic template [ci skip] | yuuji.yaginuma | 2015-04-20 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Implicitly skip spring for `rails new --dev` | Godfrey Chan | 2015-04-20 | 2 | -1/+9 | |
* | | | | | | | | | | Consistency: Rails master -> edge Rails [ci skip] | Godfrey Chan | 2015-04-20 | 1 | -1/+1 | |
* | | | | | | | | | | Fix typos in contributing guide [ci skip] | Godfrey Chan | 2015-04-19 | 1 | -2/+2 | |
* | | | | | | | | | | Merge pull request #19821 from chancancode/bug_report_templates_guide | Zachary Scott | 2015-04-19 | 1 | -9/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Better explain the bug report templates [ci skip] | Godfrey Chan | 2015-04-19 | 1 | -9/+13 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Only *configure* the queue in setup; DB creation must come later | Matthew Draper | 2015-04-20 | 2 | -21/+25 | |
* | | | | | | | | | | Shuffle a few things in aid of easier debugging | Matthew Draper | 2015-04-20 | 1 | -20/+36 | |
* | | | | | | | | | | Fix sidekiq test order dependency | Matthew Draper | 2015-04-20 | 2 | -2/+3 | |
* | | | | | | | | | | Merge pull request #19818 from chancancode/generic_bug_report_template | Eileen M. Uchitelle | 2015-04-19 | 2 | -0/+41 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add a "generic" bug report template | Godfrey Chan | 2015-04-19 | 2 | -0/+41 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #19817 from tpitale/4_2-release-notes-fix | Rafael Mendonça França | 2015-04-19 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update 4_2_release_notes.md | Tony Pitale | 2015-04-19 | 1 | -3/+2 | |
* | | | | | | | | | | | Use _read_attribute(primary_key) instead of id | Rafael Mendonça França | 2015-04-19 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #19783 from vngrs/raise_error_on_touch_if_object_is_stale | Sean Griffin | 2015-04-19 | 2 | -3/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Raise StaleObjectError if touched object is stale and locking is enabled | Mehmet Emin İNAÇ | 2015-04-19 | 2 | -3/+25 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #19814 from y-yagi/array_inquiry | Rafael Mendonça França | 2015-04-19 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | add missing require for ArrayInquirer | yuuji.yaginuma | 2015-04-19 | 1 | -0/+2 | |
* | | | | | | | | | | Merge pull request #19799 from yui-knk/fix/wrap_doc2 | Arthur Nogueira Neves | 2015-04-19 | 2 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ci skip] Fix docs and guide about 'Array.wrap' | yui-knk | 2015-04-19 | 2 | -5/+6 |