aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19858 from cllns/fix-scaffolding-css-formattingRafael Mendonça França2015-04-221-7/+20
|\ | | | | Fix formatting of scaffold css
| * 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 deprecated
| * | Clearify that alias_method_chain is deprecatedPrem Sichanugrist2015-04-221-0/+3
| | | | | | | | | | | | | | | This was not clear on the API documentation that the method was deprecated in a982a42d766169c2170d7f100c2a5ceb5430efb1.
* | | Refactor ActiveSupport::Timezone#strptimeAndrew White2015-04-222-28/+44
| | | | | | | | | | | | | | | Make strptime behave more like parse when components are missing and share behavior between the two methods.
* | | Add ActiveSupport::TimeZone#strptime.Paul A Jungwirth2015-04-223-0/+90
| | | | | | | | | | | | This makes it easier to parse user-inputted times as from a given time zone.
* | | Merge pull request #19856 from sikachu/silence-mathn-warningRafael Mendonça França2015-04-221-1/+1
|\ \ \ | | | | | | | | Silence warning from requiring mathn
| * | | Silence warning from requiring mathnPrem Sichanugrist2015-04-221-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Running Action View test case currently printing out this warning: lib/mathn.rb is deprecated This should silence the warning since we really want to require this file in this test.
* | | Merge pull request #19852 from sbhatore/doc_fix_cookiesSantiago Pastorino2015-04-221-2/+2
|\ \ \ | |/ / |/| | [ci skip] UpgradeLegacySignedCookieJar Doc fix
| * | [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::Subprocess
| * | 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 newlines between divs in form scaffolding
| * | | Add blank lines between divs in form scaffoldingSean Collins2015-04-201-0/+2
| | |/ | |/|
* | | Merge pull request #19779 from ↵Zachary Scott2015-04-211-13/+20
|\ \ \ | | | | | | | | | | | | | | | | jonatack/improve-contributing-to-ruby-on-rails-guide Improve the Contributing to Rails Guide [skip ci]
| * | | Improve the Contributing to Rails Guide [skip ci]Jon Atack2015-04-161-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First commit: This PR improves the "4.12 Commit Your Changes" section of the Contributing to Ruby on Rails Guide: - Fix formatting of the commit message example - Improve readability and clarity - Fix grammar - Wrap lines See the before and after images below in this PR. ----- Second commit: - Rewrite to remove the word "buffer" [skip ci]
* | | | Merge pull request #19847 from ↵Rafael Mendonça França2015-04-213-2/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fertapric/activemodel-dirty-after-save-syntactic-sugar Activemode::Dirty attributes query methods consistency before and after saving.
| * | | | Add `ActiveModel::Dirty#[attr_name]_previously_changed?` andFernando Tapia Rico2015-04-213-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveModel::Dirty#[attr_name]_previous_change` to improve access to recorded changes after the model has been saved. It makes the dirty-attributes query methods consistent before and after saving.
* | | | | 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]
| * | | | | 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`
| * | | | | [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
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 1f006c an option was added called :class to allow passing anonymous classes to association definitions. Since using :class instead of :class_name is a fairly common typo even amongst experienced developers this can result in hard to debug errors arising in raise_on_type_mismatch? To fix this we're renaming the option from :class to :anonymous_class as that is a more correct description of what the option is for. Since this was an internal, undocumented option there is no need for a deprecation. Fixes #19659
* | | | Merge pull request #19839 from yui-knk/fix/guide2Yves Senn2015-04-211-1/+1
|\ \ \ \ | |_|/ / |/| | | [ci skip] Fix linked html file
| * | | [ci skip] Fix linked html fileyui-knk2015-04-211-1/+1
|/ / /
* | | capitalize titleXavier Noria2015-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | According to the guidelines: http://guides.rubyonrails.org/ruby_on_rails_guides_guidelines.html#headings References #19821.
* | | Merge pull request #19822 from y-yagi/correct_generic_template_linkGodfrey Chan2015-04-201-1/+1
|\ \ \ | | | | | | | | correct link to Generic template [ci skip]
| * | | 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
| | | | | | | | | | | | | | | | | | Spring seems like an obvious foot gun for the `--dev` setup, presumably you are about to make lots of changes to the codebase, so it should always reload the framework.
* | | 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
| | | | | | | | | | | | | | | * includes -> include * "on your computer" is implied
* | | Merge pull request #19821 from chancancode/bug_report_templates_guideZachary Scott2015-04-191-9/+13
|\ \ \ | | | | | | | | Better explain the bug report templates [ci skip]
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | setup gets called from the initializer, so it happens more than once in a test run. Trying to drop the database again after the first process is connected is.. ineffective. And entirely pointless. Instead, defer creating the database to start_workers -- which only happens once, right before we start doing anything real.
* | | Shuffle a few things in aid of easier debuggingMatthew Draper2015-04-201-20/+36
| | | | | | | | | | | | | | | | | | | | | * Don't swallow output -- if there is any, it's probably useful * Wait for the process to finish * Use IPC instead of a sleep * No need for a pidfile
* | | Fix sidekiq test order dependencyMatthew Draper2015-04-202-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Requiring sidekiq/testing changes stuff, so we need to counteract that after we do so. And given its potential to confuse things, let's do it up front, at a predictable point.
* | | Merge pull request #19818 from chancancode/generic_bug_report_templateEileen M. Uchitelle2015-04-192-0/+41
|\ \ \ | | | | | | | | Add a "generic" bug report template
| * | | Add a "generic" bug report templateGodfrey Chan2015-04-192-0/+41
|/ / / | | | | | | | | | | | | This template gives contributors a starting point to use when reporting bugs that does not involve Active Record or Action Pack.
* | | Merge pull request #19817 from tpitale/4_2-release-notes-fixRafael Mendonça França2015-04-191-3/+2
|\ \ \ | | | | | | | | Binding to localhost only allows access to localhost
| * | | Update 4_2_release_notes.mdTony Pitale2015-04-191-3/+2
| | | |
* | | | Use _read_attribute(primary_key) instead of idRafael Mendonça França2015-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid the indirection of having calling id since we already know which is the primary key column. Also this will make explicit the behavior since it is not clear that id gets the right primary key value and not just the value of the "id" column.
* | | | Merge pull request #19783 from vngrs/raise_error_on_touch_if_object_is_staleSean Griffin2015-04-192-3/+25
|\ \ \ \ | |/ / / |/| | | Raise StaleObjectError if touched object is stale and locking is enabled
| * | | Raise StaleObjectError if touched object is stale and locking is enabledMehmet Emin İNAÇ2015-04-192-3/+25
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #19776 change test variable names and use more verbose on method less verbose use _read_attribute instead of send
* | | Merge pull request #19814 from y-yagi/array_inquiryRafael Mendonça França2015-04-191-0/+2
|\ \ \ | | | | | | | | add missing require for ArrayInquirer
| * | | add missing require for ArrayInquireryuuji.yaginuma2015-04-191-0/+2
| | | |
* | | | Merge pull request #19799 from yui-knk/fix/wrap_doc2Arthur Nogueira Neves2015-04-192-5/+6
|\ \ \ \ | | | | | | | | | | [ci skip] Fix docs and guide about 'Array.wrap'
| * | | | [ci skip] Fix docs and guide about 'Array.wrap'yui-knk2015-04-192-5/+6
| | | | |
* | | | | Merge pull request #19812 from piton4eg/patch-1Robin Dupret2015-04-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update association_basics.md [ci skip]
| * | | | | Update association_basics.mdMarkov Alexey2015-04-191-1/+1
| | |/ / / | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 10:12:20 +0000