68a033ea5f
Merge pull request #19858 from cllns/fix-scaffolding-css-formatting
...
Fix formatting of scaffold css
2015-04-22 13:44:20 -03:00
f90e1bc215
Fix formatting of scaffold css
2015-04-22 12:40:06 -04:00
eb9e863648
Merge pull request #19857 from sikachu/remove-alias-method-chain-doc
...
Clearify that alias_method_chain is deprecated
2015-04-22 13:20:42 -03:00
3aa26cfb19
Improve ActiveSupport::TimeWithZone conversion to YAML
...
Previously when converting AS::TimeWithZone to YAML it would be output
as a UTC timestamp. Whilst this preserves the time information accurately
it loses the timezone information. This commit changes that so that it is
saved along with the time information. It also provides nicer encoding of
AS::TimeZone instances themselves which previously embedded all of the
data from the TZInfo records.
Fixes #9183 .
2015-04-22 12:12:39 -04:00
5302d244eb
Refactor ActiveSupport::Timezone#strptime
...
Make strptime behave more like parse when components are missing and
share behavior between the two methods.
2015-04-22 12:05:07 -04:00
a5e507fa0b
Add ActiveSupport::TimeZone#strptime.
...
This makes it easier to parse user-inputted times as from a given time zone.
2015-04-22 12:05:07 -04:00
5bc7736806
Clearify that alias_method_chain is deprecated
...
This was not clear on the API documentation that the method was
deprecated in a982a42d76
2015-04-22 12:03:34 -04:00
9a034bc3b9
Merge pull request #19856 from sikachu/silence-mathn-warning
...
Silence warning from requiring mathn
2015-04-22 12:57:11 -03:00
01dad5252b
Merge pull request #19852 from sbhatore/doc_fix_cookies
...
[ci skip] UpgradeLegacySignedCookieJar Doc fix
2015-04-22 11:51:31 -04:00
5efd823d9b
Silence warning from requiring mathn
...
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.
2015-04-22 11:49:35 -04:00
cdbf685994
pass over CHANGELOGs. [ci skip]
2015-04-22 14:44:30 +02:00
8f131a9ed5
[ci skip] UpgradeLegacySignedCookieJar Doc fix
2015-04-22 13:39:38 +05:30
9a1fa3e8f8
Merge pull request #19819 from gazay/no_fork_issue
...
MRI compatible code for ActiveSupport::Testing::Isolation::Subprocess
2015-04-22 03:36:59 -03:00
ede051818a
Merge pull request #19833 from cllns/fix-scaffolding-spacing
...
Add newlines between divs in form scaffolding
2015-04-22 00:50:48 -03:00
b0cb4cad1e
Merge pull request #19779 from jonatack/improve-contributing-to-ruby-on-rails-guide
...
Improve the Contributing to Rails Guide [skip ci]
2015-04-21 14:39:16 -04:00
7258b976f5
Merge pull request #19847 from fertapric/activemodel-dirty-after-save-syntactic-sugar
...
Activemode::Dirty attributes query methods consistency before and after saving.
2015-04-21 14:53:15 -03:00
f072db8e4f
Add `ActiveModel::Dirty#[attr_name]_previously_changed?` and
...
`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.
2015-04-21 19:30:46 +02:00
ba24900779
Merge pull request #19846 from y-yagi/update_ruby_version
...
update Ruby required version in Getting Started guide [ci skip]
2015-04-21 14:19:48 -03:00
9a0177b604
update Ruby required version in Getting Started guide [ci skip]
2015-04-22 01:37:16 +09:00
43be687bf3
Merge pull request #19842 from yui-knk/fix/ruby_version
...
[ci skip] Update `current version of Ruby`
2015-04-21 09:02:32 -04:00
ac2b7a5c4d
Rename association option :class to :anonymous_class
...
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
2015-04-21 08:48:22 -04:00
e509bfc819
[ci skip] Update `current version of Ruby`
2015-04-21 20:53:03 +09:00
b12abe6733
Merge pull request #19839 from yui-knk/fix/guide2
...
[ci skip] Fix linked html file
2015-04-21 10:55:26 +02:00
9a37109bc8
[ci skip] Fix linked html file
2015-04-21 13:53:14 +09:00
f3b709e004
Add blank lines between divs in form scaffolding
2015-04-20 17:31:16 -04:00
e539866d80
capitalize title
...
According to the guidelines:
http://guides.rubyonrails.org/ruby_on_rails_guides_guidelines.html#headings
References #19821 .
2015-04-20 11:30:46 +02:00
b4546b3934
Merge pull request #19822 from y-yagi/correct_generic_template_link
...
correct link to Generic template [ci skip]
2015-04-20 01:22:12 -04:00
986753f73a
correct link to Generic template [ci skip]
2015-04-20 14:13:47 +09:00
01e37ed2a9
Implicitly skip spring for `rails new --dev`
...
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.
2015-04-20 00:34:20 -04:00
0cfc34ae9a
Consistency: Rails master -> edge Rails [ci skip]
2015-04-20 00:08:20 -04:00
60cb61dba6
Fix typos in contributing guide [ci skip]
...
* includes -> include
* "on your computer" is implied
2015-04-19 23:43:18 -04:00
9bcb54f153
Merge pull request #19821 from chancancode/bug_report_templates_guide
...
Better explain the bug report templates [ci skip]
2015-04-19 20:18:09 -07:00
b37845cc25
Better explain the bug report templates [ci skip]
2015-04-19 23:03:50 -04:00
8b09b45458
Only *configure* the queue in setup; DB creation must come later
...
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.
2015-04-20 09:14:19 +09:30
41ae432f49
Shuffle a few things in aid of easier debugging
...
* 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
2015-04-20 08:50:24 +09:30
2ca8545e51
Fix sidekiq test order dependency
...
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.
2015-04-20 08:21:15 +09:30
a2bf755c61
Merge pull request #19818 from chancancode/generic_bug_report_template
...
Add a "generic" bug report template
2015-04-19 18:39:41 -04:00
ee43a67c2c
Add a "generic" bug report template
...
This template gives contributors a starting point to use when reporting bugs
that does not involve Active Record or Action Pack.
2015-04-19 15:18:01 -07:00
00aa1afae3
Merge pull request #19817 from tpitale/4_2-release-notes-fix
...
Binding to localhost only allows access to localhost
2015-04-19 17:34:14 -04:00
b584cc68fc
Use _read_attribute(primary_key) instead of id
...
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.
2015-04-19 17:14:08 -04:00
9721b45b40
Merge pull request #19783 from vngrs/raise_error_on_touch_if_object_is_stale
...
Raise StaleObjectError if touched object is stale and locking is enabled
2015-04-19 16:54:39 -04:00
5e8d96c523
Raise StaleObjectError if touched object is stale and locking is enabled
...
Fixes #19776
change test variable names and use more verbose on method
less verbose
use _read_attribute instead of send
2015-04-19 23:50:13 +03:00
b26fafcc16
Update 4_2_release_notes.md
2015-04-19 16:23:00 -04:00
8f3584ab30
Merge pull request #19814 from y-yagi/array_inquiry
...
add missing require for ArrayInquirer
2015-04-19 15:13:52 -04:00
4e141f16ec
Merge pull request #19799 from yui-knk/fix/wrap_doc2
...
[ci skip] Fix docs and guide about 'Array.wrap'
2015-04-19 09:53:19 -07:00
c94577dd5c
[ci skip] Fix docs and guide about 'Array.wrap'
2015-04-19 23:22:49 +09:00
0ff87595f0
Merge pull request #19812 from piton4eg/patch-1
...
Update association_basics.md [ci skip]
2015-04-19 15:59:54 +02:00
33653c8898
add missing require for ArrayInquirer
2015-04-19 20:26:05 +09:00
5cab1fb9da
Merge pull request #19811 from prathamesh-sonpatki/fix-aj-guide
...
Spell out "asynchronously" instead of async in guides [ci skip]
2015-04-19 13:05:36 +02:00
01ea8c22dd
Update association_basics.md
2015-04-19 08:33:19 +03:00
Rafael Mendonça França