aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |/ / | |/| |
* | | | Merge pull request #19811 from prathamesh-sonpatki/fix-aj-guideRobin Dupret2015-04-191-1/+1
|\ \ \ \ | |/ / / |/| | | Spell out "asynchronously" instead of async in guides [ci skip]
| * | | Spell out "asynchronously" instead of async in guides [ci skip]Prathamesh Sonpatki2015-04-191-1/+1
|/ / /
* | | Autosave existing records on HMT associations when the parent is newSean Griffin2015-04-183-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To me it seems like this should only be the case if `autosave: true` is set on the association. However, when implemented that way, it caused issues with has many associations, where we have explicit tests stating that child records are updated when the parent is new, even if autosave is not set (presumably to update the parent id, but other changed attributes would be persisted as well). It's quirky, but at least we should be consistently quirky. This constitutes a minor but subtle change in behavior, and therefore should not be backported to 4.2 and earlier. Fixes #19782
* | | Merge pull request #19787 from Senjai/patch-2Yves Senn2015-04-181-5/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | [Doc] Encourage users to user super to override methods. [ci skip]
| * | | Encourage users to user super to override methods.Richard Wilson2015-04-161-5/+4
| | |/ | |/| | | | IMO we shouldn't encourage users to use methods they shouldn't need to know about. As Song (in this example) inherits from ActiveRecord, we can use super here instead to get the same effect with the bonus of not knowing how active record actually implements these methods.
* | | Merge pull request #19806 from vircung/masterYves Senn2015-04-181-0/+23
|\ \ \ | | | | | | | | | | | | Improve documentation for uuid [ci skip]
| * | | Improve documentation [ci skip]Jacek Nakonieczny2015-04-181-0/+25
|/ / / | | | | | | | | | Add information about usage `uuid` type with `reference`
* | | Merge pull request #19802 from sikachu/add-missing-requireRafael Mendonça França2015-04-171-0/+1
|\ \ \ | | | | | | | | Add missing require for String#strip_heredoc
| * | | Add missing require for String#strip_heredocPrem Sichanugrist2015-04-171-0/+1
|/ / / | | | | | | | | | | | | | | | This method is being used in `#xml_http_request`, but was not properly required. This causes `NoMethodError` on projects that are doing integration test.
* | | Merge pull request #19800 from yui-knk/fix/wrap_doc3Abdelkader Boudih2015-04-172-2/+2
|\ \ \ | |_|/ |/| | [ci skip] Replace `list` with `array`
| * | [ci skip] Replace `list` with `array`yui-knk2015-04-182-2/+2
|/ /
* | Merge pull request #19795 from yui-knk/fix/without_guideAbdelkader Boudih2015-04-171-1/+1
|\ \ | |/ |/| [ci skip] Update code example of Enumerable#without
| * [ci skip] Update code example of Enumerable#withoutyui-knk2015-04-171-1/+1
|/
* Merge pull request #19780 from 10io/active_job_testingAbdelkader Boudih2015-04-161-0/+7
|\ | | | | add active job testing section [ci skip]
| * add active job testing section [ci skip]David Fernandez2015-04-161-0/+7
|/
* Merge pull request #19778 from thenickcox/commands_docsRichard Schneeman2015-04-161-0/+11
|\ | | | | [ci skip] Document running a rake command as a rails command
| * [ci skip] Document running a rake command as a rails commandNick Cox2015-04-151-0/+11
|/
* Merge pull request #19775 from vngrs/fix_typo_asser_urlAbdelkader Boudih2015-04-151-6/+6
|\ | | | | fix typo asser url [ci skip]
| * fix typo asser url [ci skip]Mehmet Emin İNAÇ2015-04-161-6/+6
|/
* Merge pull request #19774 from davydovanton/doc-update-asser-urlAbdelkader Boudih2015-04-151-0/+30
|\ | | | | [Skip ci] Add information about :host options
| * [Skip ci] Add information about :host optionsAnton Davydov2015-04-161-0/+30
| | | | | | | | | | | | Added informations about :host options for each url helper (#javascript_url, #video_url, #stylesheet_url, etc) based on #asser_url method.
* | Merge pull request #19766 from blasterpal/small_typo_in_asset_pipelineRafael Mendonça França2015-04-151-1/+1
|\ \ | | | | | | Correct small typo.
| * | Correct small typo.Hank Beaver2015-04-151-1/+1
| | | | | | | | | | | | * files are written to hard "disk" not "disc".
* | | Merge pull request #19765 from y-yagi/fix_typo_in_form_builderKasper Timm Hansen2015-04-151-1/+1
|\ \ \ | |/ / |/| | remove extra `=` in form builder example [ci skip]
| * | remove extra `=` in form builder example [ci skip]yuuji.yaginuma2015-04-151-1/+1
|/ /
* | Merge pull request #19763 from jonatack/fix-typos-in-docsYves Senn2015-04-1511-29/+55
|\ \ | | | | | | Fix typos and improve the documentation
| * | Fix typos and improve the documentationJon Atack2015-04-1511-29/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a squash of the following commits, from first to last: - Fix minor, random things I’ve come across lately that individually did not seem worth making a PR for, so I saved them for one commit. One common error is using “it’s” (which is an abbreviation of “it is”) when the possessive “its” should be used for indicating possession. - Changes include the name of a test, so remove the `[skip ci]` (thanks @senny). - Line wrap the changes at 80 chars and add one more doc fix. - Add a missing line wrap in the Contributing to Ruby on Rails Guide. - Line wrap the `TIP` section in the Contributing to Ruby on Rails Guide as well. Rendering the guide locally with `bundle exec rake guides:generate` did not show any change in on-screen formatting after adding the line wrap. The HTML generated is (extra line added to illustrate where the line wrap takes place): <div class="info"><p>Please squash your commits into a single commit when appropriate. This simplifies future cherry picks and also keeps the git log clean.</p></div> - Squash commits.
* | | Revert "Merge pull request #19755 from yuki24/activerecord/support-for-set"Yves Senn2015-04-153-15/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 524d40591eaa2f4d007409bfad386f6b107492eb, reversing changes made to 34d3a6095100245283861ef480a54d0643bbee4c. Reasoning behind the revert are in the PR discussion: https://github.com/rails/rails/pull/19755 - This means that types can no longer cast to/from `Set`, and reasonably work with `where` (we already have this problem for `array`/`json` types on pg) - This adds precedent for every other `Enumerable`, and we can't target `Enumerable` directly. - Calling `to_a` on a `Set` is reasonable.
* | Merge pull request #19446 from ↵Zachary Scott2015-04-141-4/+6
|\ \ | | | | | | | | | | | | andersonDadario/fix_security_guide_captcha_03_21_2015 Fix security guide captcha 03 21 2015 [ci skip]
| * | [ci skip] Fix for Security Guide - Captcha SectionAnderson Dadario2015-03-221-4/+6
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 13:51:38 +0000