Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Apr 19, 2015
@chancancode chancancode 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.
ee43a67
@eileencodes eileencodes Merge pull request #19818 from chancancode/generic_bug_report_template
Add a "generic" bug report template
a2bf755
@matthewd matthewd 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.
2ca8545
@matthewd matthewd 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
41ae432
@matthewd matthewd 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.
8b09b45
Commits on Apr 20, 2015
@chancancode chancancode Better explain the bug report templates [ci skip] b37845c
@zzak zzak Merge pull request #19821 from chancancode/bug_report_templates_guide
Better explain the bug report templates [ci skip]
9bcb54f
@chancancode chancancode Fix typos in contributing guide [ci skip]
* includes -> include
* "on your computer" is implied
60cb61d
@chancancode chancancode Consistency: Rails master -> edge Rails [ci skip] 0cfc34a
@chancancode chancancode 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.
01e37ed
@y-yagi y-yagi correct link to Generic template [ci skip] 986753f
@chancancode chancancode Merge pull request #19822 from y-yagi/correct_generic_template_link
correct link to Generic template [ci skip]
b4546b3
@fxn fxn capitalize title e539866
@cllns cllns Add blank lines between divs in form scaffolding f3b709e
Commits on Apr 21, 2015
@yui-knk yui-knk [ci skip] Fix linked html file 9a37109
@senny senny Merge pull request #19839 from yui-knk/fix/guide2
[ci skip] Fix linked html file
b12abe6
@yui-knk yui-knk [ci skip] Update `current version of Ruby` e509bfc
@pixeltrix pixeltrix 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
ac2b7a5
@zzak zzak Merge pull request #19842 from yui-knk/fix/ruby_version
[ci skip] Update `current version of Ruby`
43be687
@stevenspiel stevenspiel Update url_helper.rb
add block to link_to_if when condition is true
58c3a04
@y-yagi y-yagi update Ruby required version in Getting Started guide [ci skip] 9a0177b
@rafaelfranca rafaelfranca Merge pull request #19846 from y-yagi/update_ruby_version
update Ruby required version in Getting Started guide [ci skip]
ba24900
@fertapric fertapric 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.
f072db8
@rafaelfranca rafaelfranca Merge pull request #19847 from fertapric/activemodel-dirty-after-save…
…-syntactic-sugar

Activemode::Dirty attributes query methods consistency before and after saving.
7258b97
@zzak zzak Merge pull request #19779 from jonatack/improve-contributing-to-ruby-…
…on-rails-guide

Improve the Contributing to Rails Guide [skip ci]
b0cb4ca
Commits on Apr 22, 2015
@rafaelfranca rafaelfranca Merge pull request #19833 from cllns/fix-scaffolding-spacing
Add newlines between divs in form scaffolding
ede0518
@rafaelfranca rafaelfranca Merge pull request #19819 from gazay/no_fork_issue
MRI compatible code for ActiveSupport::Testing::Isolation::Subprocess
9a1fa3e
@sbhatore sbhatore [ci skip] UpgradeLegacySignedCookieJar Doc fix 8f131a9
@senny senny pass over CHANGELOGs. [ci skip] cdbf685
@sikachu sikachu 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.
5efd823
@spastorino spastorino Merge pull request #19852 from sbhatore/doc_fix_cookies
[ci skip] UpgradeLegacySignedCookieJar Doc fix
01dad52
@rafaelfranca rafaelfranca Merge pull request #19856 from sikachu/silence-mathn-warning
Silence warning from requiring mathn
9a034bc
@sikachu sikachu Clearify that alias_method_chain is deprecated
This was not clear on the API documentation that the method was
deprecated in a982a42.
5bc7736
@pjungwir pjungwir Add ActiveSupport::TimeZone#strptime.
This makes it easier to parse user-inputted times as from a given time zone.
a5e507f
@pixeltrix pixeltrix Refactor ActiveSupport::Timezone#strptime
Make strptime behave more like parse when components are missing and
share behavior between the two methods.
5302d24
@pixeltrix pixeltrix 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.
3aa26cf
@rafaelfranca rafaelfranca Merge pull request #19857 from sikachu/remove-alias-method-chain-doc
Clearify that alias_method_chain is deprecated
eb9e863
@cllns cllns Fix formatting of scaffold css f90e1bc
@rafaelfranca rafaelfranca Merge pull request #19858 from cllns/fix-scaffolding-css-formatting
Fix formatting of scaffold css
68a033e
@pixeltrix pixeltrix Merge pull request #17333 from rails/encode-twz-tzinfo-in-yaml
Improve ActiveSupport::TimeWithZone conversion to YAML
3ab66a0
@rafaelfranca rafaelfranca Don't ask something that we don't want to
We only want to support adapters that we officially support through the
entire framework so it is better to not ask patches for adapters that
we may not support
d0ec2a9
@piton4eg piton4eg Fix find_each options [ci skip] bd41f68
@rafaelfranca rafaelfranca Merge pull request #19862 from piton4eg/patch-2
Fix find_each options [ci skip]
7196372
@pixeltrix pixeltrix Remove sqlite support from `rails dbconsole`
Support for versions of SQLite less than 3 was removed in #6011 as part
of the Rails 4.0 release. Therefore there is no need to have support for
it in the `rails dbconsole` command anymore.
688c0ec
@rafaelfranca rafaelfranca Require yaml before trying to rescue its exception class 8d901b9
@matthewd matthewd Queue Classic runs a second earlier than scheduled
That seems to be a bug, but as we don't actually care about the
precision for our test, we'll just give it a bit longer.

[Matthew Draper & Cristian Bica]
40ff508
Commits on Apr 23, 2015
@thenickcox thenickcox [ci skip] Add, clean up docs in ActionDispatch ActionDispatch middleware 4c4fa41
@Ecco Ecco Fix a minor grammatical issue in the doc
8e103d1
@schneems schneems Merge pull request #19870 from thenickcox/action_dispatch_mw_docs
[ci skip] Add, clean up docs in ActionDispatch ActionDispatch middleware
8dd0bdf
@senny senny Merge pull request #19872 from Ecco/master
Fix a minor grammatical issue in the doc [ci skip]
805bfc9
@cllns cllns Fix CSS formatting in welcome#index.html.erb 46f5114
@rafaelfranca rafaelfranca Merge pull request #19875 from cllns/fix-css-formatting-in-welcome-index
Fix CSS formatting in welcome#index.html.erb
0df2f7f
@rafaelfranca rafaelfranca Merge pull request #18880 from mudge/timestamp-index-bug
Fix missing index when using timestamps with index
6f37d7e
@sbhatore sbhatore Squashed commit of the following:
commit a88875a
Author: Siddharth Bhatore <sbhatore95@gmail.com>
Date:   Thu Apr 23 12:26:08 2015 +0530

    [ci skip] Update doc fix cookies

commit f175eaa
Author: Siddharth Bhatore <sbhatore95@gmail.com>
Date:   Mon Apr 20 12:58:04 2015 +0530

    Description inside Signed and Encrypted CookieJars added
f92f5b7
@rafaelfranca rafaelfranca Merge pull request #19823 from sbhatore/doc_fix_1
[ci skip] Description inside Signed and Encrypted CookieJars added
d949460
@rafaelfranca rafaelfranca Add nodoc to some private constants [ci skip] 4128e70
@rafaelfranca rafaelfranca Remove nonexistent adapter
Closes #19866

[ci skip]
f5ae289
@bboe bboe Remove unused WorkshopsController class in redirect_test. 0eaae02
@rafaelfranca rafaelfranca Merge pull request #19879 from bboe/RedirectTestCleanup
Remove unused WorkshopsController class in redirect_test.
03e987c
@sikachu sikachu Silence warning from MySQL::Error object in test
When running Active Record MySQL test, this warning is printed in the
console:

    warning: instance variable errno not initialized

It turns out that this is a warning from `mysql` gem in MySQL::Error
object. However, since the `mysql` gem is no longer maintained, and
there won't be a newer version, it make sense for us to just silence
this warning to make the output cleaner.
150f409
@rafaelfranca rafaelfranca Merge pull request #19881 from sikachu/silence-mysql-errno-warning
Silence warning from MySQL::Error object in test
55d9e49
Commits on Apr 24, 2015
@chancancode chancancode Uncomment byebug in framework Gemfile
History:

1. `debugger` was there until d2ed433 where it was commented out, and I
   couldn't figure out why

2. Since then we inherited that when switching to `byebug` in 93559da

Reasons:

1. It's nice to have a debugger when working on framework bugs

2. It's an uncommented dependency in app Gemfiles since Rails 4.2 (see fbe38c9)
78b51a8
@senny senny docs for `create_table` and non-int primary keys. [ci skip] 107526e
@senny senny use a more descriptive example. [ci skip]
follow up to 107526e
b29d794
@imtayadeway imtayadeway Fix grammar/style: pluralize 'each of its method'
[ci skip]
875f675
@imtayadeway imtayadeway Fix grammar/style: break up long sentence.
A conjunction was needed to make these sentences correct. Breaking them
up seemed like a better option.

[ci skip]
37349f7
@imtayadeway imtayadeway Fix grammar/style: use (v) fall back (on).
[ci skip]
ed6de3a
@imtayadeway imtayadeway Fix grammar/style: assigns/declares -> assignments/declarations.
[ci skip]
f207d94
@mikestone14 mikestone14 image_tag raises an error if size is passed with height and/or width 8cbeec7
@derekprior derekprior Correct translate helper docs [ci skip]
The documentation previously stated that calling `translate(".foo")` was
equivalent to calling `I18n.translate("people.index.foo")` which is
incorrect due to the various other functions of the `translate` view
helper. This has been fixed.

Additionally, a note about forcing the view helper to re-raise
exceptions was added to the section detailing the handling of missing
translations.

Other cleanup includes:

* Consistent formatting of code
* Stop indenting bulleted list as a code sample
* Tighten some of the language
* Wrap at 80 characters.
6ad5e7e
@sshaw sshaw Refer to the constructer argument in docs
c744af7
@claudiob claudiob Merge pull request #19888 from imtayadeway/tw/attribute-methods-docs
Fix grammar/style in attribute methods docs
ab10f6e
@senny senny Merge pull request #19236 from sshaw/more_tagged_logging_docs
More docs on tagged logging [ci skip]
dc69844
@thenickcox thenickcox [ci skip] Rework docs, add examples on deprecation proxies ea30e32
Commits on Apr 25, 2015
@zzak zzak Merge pull request #19894 from thenickcox/deprecated_proxy_docs
[ci skip] Rework docs, add examples on deprecation proxies
5d6b543
@amatsuda amatsuda Do not show --helper and --assets options in the controller generator…
… help

These options are not actually available.
Thanks @soutaro for letting me aware of this.
9b36cf0
@amatsuda amatsuda Why do we add a top-level constant here? 9b3fa76
@amatsuda amatsuda :put_litter_in_its_place: Unused method
This method is not in use since 479c7ca
6a4771f
@amatsuda amatsuda :put_litter_in_its_place: Unused methods 2fab161
@robin850 robin850 Minor edits to the "Action View Overview" guide
Follow-up to #19672 and 8b0aa0c.

[ci skip]
e61f4ea
@tgxworld tgxworld No need to capitalize verbs. [CI SKIP] 14d7e05
@arthurnn arthurnn Merge pull request #19899 from tgxworld/fix_doc
No need to capitalize verbs. [CI SKIP]
0cb047a
@zzak zzak Merge pull request #19892 from derekprior/dp-translate-helper-docs
Correct translate helper docs [ci skip]
7f50d63
@simi simi Add test for multiple suggested generator names. b3a16b6
@arthurnn arthurnn Fix multiple suggestion test 6a7cf51
@arthurnn arthurnn Revert "Fix multiple suggestion test"
This reverts commit 6a7cf51.
74f5491
Commits on Apr 26, 2015
@khundawg khundawg [ci skip] Update ActiveSupport::Subscriber documentation 4c945cc
@schneems schneems Merge pull request #19902 from khundawg/dm-active-support-subsciber-doc
[ci skip] Update ActiveSupport::Subscriber documentation
951ec03
@chancancode chancancode Merge pull request #19884 from chancancode/uncomment-byebug
Uncomment byebug in framework Gemfile
6a9d818
@jmbejar jmbejar Fix rake routes for api apps
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
8c180cd
@zzak zzak Remove internal hacks dependent on Sprockets from RouteWrapper fc0460a
@prathamesh-sonpatki prathamesh-sonpatki Escape README in Plugin builder API documentation
 - So that RDoc will not generate link for README.
 [ci skip]
8b47d1f
@rafaelfranca rafaelfranca Merge pull request #19905 from prathamesh-sonpatki/no-readme-link
 Escape README in Plugin builder API documentation
a9b41fe
@prathamesh-sonpatki prathamesh-sonpatki Removed unused code from request_forgery_protection tests 0ad06f2
@carlosantoniodasilva carlosantoniodasilva Merge pull request #19909 from prathamesh-sonpatki/rm-unused-code
Removed unused code from request_forgery_protection tests
66fe531
@arthurnn arthurnn Don't reference sprockets assets on action pack
We need to ignore the `assets_prefix` when running a command like `rake
routes`. However we cannot reference asserts_prefix from action_pack as
that is a sprockets-rails concern.
See this is now implemented on sprockets-rails
rails/sprockets-rails@85b89c4
757a2bc
@arthurnn arthurnn Use latest sprockets-rails on internal dev ac98359
@arthurnn arthurnn assets:cache:clean wont clean cache anymore
See the behaviour change on sprockets-rails
rails/sprockets-rails@56725e5
d023f98
@arthurnn arthurnn Need to add config.assets.compile=true to access `.assets`
sprockets-rails will only add `Rails.application.assets` if compile is
no false. See change on sprockets-rails
rails/sprockets-rails@d7c7ee1
64114b6
@khundawg khundawg [ci skip] Update ActiveSupport::Rails and ActiveSupport::Rescuable docs
[Dave Moore]
4349192
@rafaelfranca rafaelfranca Merge pull request #19904 from zzak/rm_route_wrapper_internal_hacks
Rm route wrapper internal hacks
505fa60
@zzak zzak Merge pull request #19911 from khundawg/dm-active-support-rescuable-r…
…ails-doc

[ci skip] Update ActiveSupport::Rails and ActiveSupport::Rescuable docs
3427e66
@zzak zzak Don't document private internal constant [ci skip] dee4fbc
@zzak zzak Don't document internal monkey patch for mysql gem [ci skip]
Also added reference for to_date, as it belongs historically.
974b6ac
Commits on Apr 27, 2015
@zzak zzak nodoc private internal constants from ActiveJob::Arguments ba35b47
@senny senny Revert "Merge pull request #17920 from calebthompson/dont-rely-on-env…
…ironment-task-for-schema-load"

This reverts commit 08ff4cc, reversing
changes made to 6c9ed6d.

Caused by #17920.

Closes #19545.

This patch introduced regressions because initializers were no longer
loaded. Specifically missing inflections result in broken restores of
the database.
557c46a
@senny senny test, for `create_table` and `foreign_key: true` no-op. Closes #19794.
Add a test-case to make sure that `create_table` with
a `foreign_key: true` and an adapter without foreign key support
does not blow up.

Motivated by #19794.

Originating from: 99a6f9e#commitcomment-10855210
f00554a
@meinac meinac Add note about sti column value to becomes method [ci skip] 4a8f081
@arthurnn arthurnn Merge pull request #18392 from brainopia/fix_route_requirements
Correct route requirements by overriding defaultls
86929c0
@arthurnn arthurnn Add changelog for rake routes default fix
[see #18392]
6d9ad0d
@senny senny Merge pull request #19918 from vngrs/becomes_missing_note_about_sti
Add note about sti column value to becomes method [ci skip]
71308be
@senny senny remove trailing whitespace. [ci skip] 16329d3
@piton4eg piton4eg Small punctuation fixes [ci skip] f08172a
@arthurnn arthurnn Merge pull request #19919 from piton4eg/patch-3
Small punctuation fixes [ci skip]
72d4d47
Commits on Apr 28, 2015
@prathamesh-sonpatki prathamesh-sonpatki Updated request_forgery_protection docs [ci skip]
 - Changed Javascript to JavaScript.
 - Added full-stop which was missing, also wrapped the sentence to 80 chars.
 - Changed proc to Proc and oauth to OAuth.
199e277
@senny senny Merge pull request #19927 from prathamesh-sonpatki/request-forgery-docs
 Updated request_forgery_protection docs [ci skip]
7edf520
@axilleas axilleas AUTH PLAIN is Base64 encoded [ci skip]
Contrary to what the name suggests, PLAIN SMTP authentication is not
sent in plain text but is Base64 encoded like the LOGIN method. Their
difference is described in the third link below.

* https://tools.ietf.org/html/rfc4954
* https://en.wikipedia.org/wiki/SMTP_Authentication
* http://www.samlogic.net/articles/smtp-commands-reference-auth.htm
e7d2cef
@senny senny Merge pull request #19718 from eagletmt/find_by-without-arg
Raise ArgumentError when find_by receives no arguments
cdf3548
@senny senny Merge pull request #19546 from DianthuDia/fix_unscope_for_less_than
Fix unscope for less than
80f011e
@artofhuman artofhuman Unlock sneakers adapter version ee68786
@senny senny Merge pull request #19907 from artofhuman/sneakers-update
Unlock sneakers adapter version
65c29b6
@senny senny guides, bring back minitest assertion table. [ci skip]
Rails has different naming conventions for the inverse assertion
methods. While minitest uses `refute` we use `_not`. We should have a
table listing the common assertions that you want to use in the Rails
context.

Refs #18305.
a66a64a
@eliotsykes eliotsykes Clarify test_order default configuration behaviour [ci skip]
Explain config.active_support.test_order defaults
to :random in newly-generated applications thanks
to generated config/environments/test.rb, otherwise
default is :sorted (until Rails 5.0).
b0d51c1
@tak1n tak1n fixed typo 6f3e635
@prathamesh-sonpatki prathamesh-sonpatki Added note about non-GET links getting converted to GET links in mai…
…ler templates [ci skip]
3d92a9e
@senny senny Merge pull request #19930 from axilleas/doc_smtp_plain_auth_fix
AUTH PLAIN is Base64 encoded [ci skip]
80d0687
@senny senny Merge pull request #19931 from prathamesh-sonpatki/note-about-non-get…
…-links

 Added note about non-GET links getting converted to GET links in mailer  Added note about non-GET links getting converted to GET links in mailer templates [ci skip]
f58c1e1
@carlosantoniodasilva carlosantoniodasilva Merge pull request #19937 from tak1n/master
Fixed typo in documentation
4a95688
@carlosantoniodasilva carlosantoniodasilva Merge pull request #19935 from eliotsykes/clarify-configuring-default…
…-test-order

Clarify test_order default configuration behaviour [ci skip]
76fc205
@axilleas axilleas Update instructions to build guides locally [ci skip]
1. Make clear where rake rdoc is executed
2. Make clear where the generated HTML files for the guides are stored
3. Use bundler 1.3.5 or later
86b6c77
@senny senny Merge pull request #19932 from axilleas/api_docs_guidelines
Make sure you execute rake rdoc from rails root directory [ci skip]
6ccf3bf
@artofhuman artofhuman Remove use of mocha in the named base tests 3ca5ae5
@senny senny mailer previews, make sure labels and values line up.
While this was true before when every `dd` had a value,
this patch makes sure that everything keeps lining up even
when the `dd` node is blank.
d704f8f
@senny senny mailer previews for `NullMail` instances. Closes #19849. 767d601
@senny senny Merge pull request #19917 from senny/preview_null_mail
Previews when `mail` wasn't called (NullMail instances).
9e84c00
@earthrid earthrid Rewording
Rewording in accordance with the documentation guidelines (‘Prefer
wordings that avoid "you"s and "your”s.’) and to remove in particular
“if you'd call”.
1856899
@zzak zzak Merge pull request #19942 from earthrid/master
Rewording
9822ce2
@rafaelfranca rafaelfranca Merge pull request #19939 from artofhuman/remove-mocha-from-some-tests
Remove use of mocha in the named base tests
7bc45df
@javan javan Make ActionMailer #cache helper a no-op, not an exception 20f6f64
@rafaelfranca rafaelfranca Merge pull request #19941 from javan/actionmailer-cache-noop
Make ActionMailer #cache helper a no-op, not an exception
f4b8b58
@thenickcox thenickcox [ci skip] Correct grammar, add docs to ActiveRecord migration generator f63d141
@zzak zzak Merge pull request #19945 from thenickcox/migration_generator_docs
[ci skip] Correct grammar, add docs to ActiveRecord migration generator
8979a5a
Commits on Apr 29, 2015
@nerdcave nerdcave ensure `method_missing` called for non-existing methods passed to
`ActiveModel::Serialization#serializable_hash`
b296799
@thiagoaugusto thiagoaugusto CHANGELOG punctuation fix
Punctuation fix
88f429c
@chancancode chancancode Revert "Merge pull request #19817 from tpitale/4_2-release-notes-fix"
This reverts commit 00aa1af, reversing
changes made to b584cc6.

Reason:

As far as we can tell, this should not be the case. Both localhost, 127.0.0.1
and ::1 is "supposed to work", so this is probably a bug somewhere.

Reopening #19815 instead.
a1c7f1b
@senny senny Merge pull request #19949 from thiagoaugusto/create-thiago-punctuatio…
…n-fix

CHANGELOG punctuation fix
4e6f005
@eugeneius eugeneius Apply schema cache dump when creating connections
The `db:schema:cache:dump` rake task dumps the database schema structure
to `db/schema_cache.dump`. If this file is present, the schema details
are loaded into the currently checked out connection by a railtie while
Rails is booting, to avoid having to query the database for its schema.

The schema cache dump is only applied to the initial connection used to
boot the application though; other connections from the same pool are
created with an empty schema cache, and still have to load the structure
of each table directly from the database.

With this change, a copy of the schema cache is associated with the
connection pool and applied to connections as they are created.
33fe7cc
@meinac meinac Add missing error messages for sucker_punch, sneakers and qu activejo…
…b adapters [ci skip]

fix error message

change raise to use rails conventions

fix misspells
6528b01
@senny senny Merge pull request #19952 from vngrs/activejob_missing_error_messages
Add missing error messages for sucker_punch, sneakers and qu
8b9e8a3
@rywall rywall Document :tld_length option for cookies. d5a6297
@zzak zzak Merge pull request #19957 from rywall/patch-2
Document :tld_length option for cookies.
8cf22ce
Commits on Apr 30, 2015
@zzak zzak Rails should be nodoc'd here [ci skip] 80ee55f
@zzak zzak Add initial doc for Enqueuing module [ci skip] 56bcd69
@zzak zzak Add initial doc for Core in AJ [ci skip] 785cb9f
@zzak zzak Add doc for original_exception in ActiveJob::DeserializationError [ci…
… skip]
b66dcc1
@imtayadeway imtayadeway Fix style/grammar/typos in Caching guide.
* avoid using unnecessary commas
* fix some typos
ae5c5b2
@zzak zzak Merge pull request #19959 from imtayadeway/tw/caching-docs
Fix style/grammar/typos in Caching guide.
79c4aac
@prathamesh-sonpatki prathamesh-sonpatki Added documentation for PostGreSQL database_statements [ci skip]
 - Added documentation for index_name_exists? and rename_index.
 - Also changed rails to \Rails in documentation of
   allowed_index_name_length.
8e73f97
@prathamesh-sonpatki prathamesh-sonpatki Nodoc validate_index_length! method
 - This method is used only by adapters to validate length of new index names.
84baa02
@schneems schneems Merge pull request #19961 from prathamesh-sonpatki/pg-docs
 Added documentation for PostGreSQL database_statements [ci skip]
a000e5c
@senny senny Merge pull request #19962 from prathamesh-sonpatki/nodoc-validate-ind…
…ex-length

 Nodoc validate_index_length! method
8fd4633
@remomueller remomueller Mailer preview now uses `url_for` to fix links to emails for apps run…
…ning on a subdirectory, closes #19092.
f5132c1
@y-yagi y-yagi match a expected value with message of `assert_equal` in AJ helper me…
…thods
9150866
Commits on May 01, 2015
@senny senny Merge pull request #19969 from y-yagi/fix_job_helper_method
match a expected value with message of `assert_equal` in AJ helper methods
4d4950f
@senny senny Merge pull request #19844 from stevenspiel/link_to_if_block_helper_ad…
…dition

Update url_helper.rb
d459b00
@senny senny Revert "Merge pull request #19844 from stevenspiel/link_to_if_block_h…
…elper_addition"

This reverts commit d459b00, reversing
changes made to 4d4950f.

:sweat:

The block is not supposed to be passed to `link_to`. It's used for a
customized behavior of the `condtion = false` case. The docs
illustrate that like so:

```
<%=
   link_to_if(@current_user.nil?, "Login", { controller: "sessions", action: "new" }) do
     link_to(@current_user.login, { controller: "accounts", action: "show", id: @current_user })
   end
%>
```
14d0e07
@senny senny add test-case for `link_to_if` behavior with a block.
This illustrates the purpose of the block for `link_to_if` and
`link_to_unless` helper methods.

It should help to prevent further mistakes like #19844.
e38dd7b
@robertomiranda robertomiranda Update documentation to contain a 24 char token [ci skip] 6541fef
@kaspth kaspth Merge pull request #19970 from robertomiranda/patch-3
Update documentation to contain a 24 char token [ci skip]
76bb6cb
@thiagoaugusto thiagoaugusto Improvement on Activerecord CHANGELOG
361f1bc
@senny senny Merge pull request #19971 from thiagoaugusto/improve-activerecord-cha…
…ngelog

Improvement on Activerecord CHANGELOG.md [ci skip]
2e7fd4a
@robertjlooby robertjlooby add upgrade note for breaking habtm change in 3.2 -> 4.0
The has_and_belongs_to_many default join_table behavior changed
between Rails 3.2 and Rails 4.0 and should be noted in the
appropriate section of the upgrade guide.

commit:
4649294
78c4e30
@trosborn trosborn Clean up debugging guide and fix minor grammatical errors[ci skip] 1beff7c
Commits on May 02, 2015
@yui-knk yui-knk [ci skip] Fix example codes of form_for method de39795
@yuki24 yuki24 AR::RecordNotSaved & RecordNotDestroyed should include an error message
When `AR::Base.save!` or `AR::Base.destroy!` is called and an exception
is raised, the exception doesn't have any error message or has a weird
message like `#<FailedBulb:0x0000000907b4b8>`. Give a better message so
we can easily understand why it's failing to save/destroy.
ad5824b
@prathamesh-sonpatki prathamesh-sonpatki Added missing fullstop in engine API docs [ci skip] 3110c98
@zzak zzak Merge pull request #19975 from prathamesh-sonpatki/engine-minor-changes
Added missing fullstop in engine API docs [ci skip]
57b9ef1
@prathamesh-sonpatki prathamesh-sonpatki Removed `assigns` from functional_test templates
 - Based on DHH's suggestion about deprecating `assigns` in
   #18305 (comment).
462094d
@zzak zzak Merge pull request #19974 from yui-knk/fix/form_for_examples_2
[ci skip] Fix example codes of form_for method
546f7ca
@zzak zzak Merge pull request #19973 from trosborn/master
Clean up debugging guide and fix minor grammatical errors[ci skip]
1a02de7
@zzak zzak Fix method call typo [ci skip] 1e7640e
@eileencodes eileencodes Use `args` instead of `*args` in `kwargs_request?` method
`*args` is not required here and should be avoided when not necessary
because `*args` are slower than `args` and create unnecessary array
allocations.
e260975
@eileencodes eileencodes Use `def before_setup` instead of `setup do`
`setup do` creates unnecessary allocations of proc objects in test
callbacks. This prevents that from happening and results in faster code.

Originally I had done this as `def setup` and all Railties tests passed.
See 044f9ab. Later it was reported there was an issue with this that
caused routes in tests to be nil because devs don't generally call
`super` in their test setups. Because of that I reverted the commit
until I could find a suitble replacement.

`before_setup` esentially does the same thing but without the
requirement that applications call `super` in their test setups.
76836ef
@meinac meinac Use ruby 1.9 lambda syntax in documentations [ci skip] e4dd700
Commits on May 03, 2015
@acapilleri acapilleri [ci skip] Uniquiness with scope can have one or more arguments 5c3be16
@kamipo kamipo Correctly dump `:options` on `create_table` for MySQL 22ba159
@kamipo kamipo Remove unused require 486a369
@mcfiredrill mcfiredrill :nodoc: change_column_null in the implmenting adapters
`change_column_null` is doc'ed only in
ActiveRecord::ConnectionAdapters::SchemaStatements, so it would make
sense to :nodoc: it elsewhere.
cc756ea
@tusharmaroo tusharmaroo Changed 'ask the rubyonrails-talk mailing list.' to 'ask it on the ru…
…byonrails-talk mailing list.'
1711c09
@senny senny Merge pull request #19983 from kamipo/remove_unused_require
Remove unused require
4606ecc
@senny senny Merge pull request #19984 from mcfiredrill/nodoc-change-column-null
:nodoc: change_column_null in the implmenting adapters
347052a
@senny senny Merge pull request #19982 from acapilleri/scope_uniquiness
[ci skip] Uniquiness with scope can have one or more arguments
5f84421
@kamipo kamipo Move PostgreSQL specific schema to postgresql_specific_schema.rb 6c8ec48
@kamipo kamipo Move comment about microseconds [ci skip]
The microseconds handling was already moved to `Quoting#quoted_date`.
e61c32c
@kamipo kamipo Change the `visit_AddColumn` visiblity for the internal API cd00526
@mcfiredrill mcfiredrill `:nodoc:` postgresql's change_column
Its nodoc'ed for the other implementations, and doc'ed in the base
class, just like the other change_column* methods.
16270ea
@kamipo kamipo Dump indexes in `create_table` instead of `add_index`
If the adapter supports indexes in create table, generated SQL is
slightly more efficient.
99801c6
@schneems schneems Merge pull request #19991 from mcfiredrill/nodoc-postgresql-change-co…
…lumn

`:nodoc:` postgresql's change_column
eb3380f
@kamipo kamipo gem 'mysql2', '~> 0.3.18'
Follow up #18914.
40323ad
@spastorino spastorino Merge pull request #19990 from kamipo/mysql2-0.3.18
gem 'mysql2', '~> 0.3.18'
7166937
@robertjlooby robertjlooby add note about habtm relations with scopes 2ffeee3
@zzak zzak Merge pull request #19988 from kamipo/move_comment_about_microseconds
Move comment about microseconds [ci skip]
8ce44b2
@kamipo kamipo Move the collation handling code from the MySQL adapter to common cla…
…sses

Some databases like MySQL allow defining collation charset for specific
columns.
446f252
@kamipo kamipo PostgreSQL: `:collation` support for string and text columns
Example:

    create_table :foos do |t|
      t.string :string_en, collation: 'en_US.UTF-8'
      t.text   :text_ja,   collation: 'ja_JP.UTF-8'
    end
f8e748b
@kamipo kamipo Missing `:bigint` [ci skip] 243a50d
@rafaelfranca rafaelfranca Merge pull request #19999 from kamipo/missing_bigint
Missing `:bigint` [ci skip]
982db48
@rafaelfranca rafaelfranca Merge pull request #19498 from chanks/activejob-que-remove-named-queues
ActiveJob: Stop using Que's named queues.
b4b2953
@rafaelfranca rafaelfranca Merge pull request #19972 from robertjlooby/document_habtm_changes_in…
…_upgrade_guide

add upgrade note for breaking habtm change in 3.2 -> 4.0
76feb8b
@rafaelfranca rafaelfranca Disable warnings on activejob tests
The implementations seems to not be interested to remove the warnings so
enabling them we are just making harder to read the outputs
c2e30f8
@rafaelfranca rafaelfranca Do not use named queues for que adapter
See #19498
5d83d11
@rafaelfranca rafaelfranca Merge pull request #19989 from kamipo/change_visit_addcolumn_visibilty
Change the `visit_AddColumn` visiblity for the internal API
7a8504d
@rafaelfranca rafaelfranca Merge pull request #19986 from tusharmaroo/my_first_contribution
Changed 'ask the rubyonrails-talk mailing list.' to 'ask it on the rubyo...
29765e7
@rafaelfranca rafaelfranca Merge pull request #19980 from vngrs/use_new_lambda_syntax_in_doc
Use ruby 1.9 lambda syntax in documentations [ci skip]
03b0911
@rafaelfranca rafaelfranca Merge pull request #19978 from kamipo/collation_option_support_for_po…
…stgresql

PostgreSQL: `:collation` support for string and text columns
1515c4d
@rafaelfranca rafaelfranca Merge pull request #19987 from kamipo/move_postgresql_specific_schema
Move PostgreSQL specific schema to postgresql_specific_schema.rb
8847bed
@rafaelfranca rafaelfranca Merge pull request #17569 from kamipo/dump_table_options
Correctly dump `:options` on `create_table` for MySQL
b6cc44b
@rafaelfranca rafaelfranca Merge pull request #17824 from yuki24/change-record-not-saved-and-not…
…-destroyed-to-include-error-msg

AR::RecordNotSaved & RecordNotDestroyed from save!/destroy! should include an error message
a278668
@rafaelfranca rafaelfranca Merge pull request #18783 from mikestone14/actionview-image-tag-override
Actionview image tag size option override
f177922
@rafaelfranca rafaelfranca Merge pull request #19994 from kamipo/dump_indexes_in_create_table
Dump indexes in `create_table` instead of `add_index`
0296610
@rafaelfranca rafaelfranca Merge pull request #19976 from prathamesh-sonpatki/rm-assigns
 Removed `assigns` from functional_test templates
d70d575
@rafaelfranca rafaelfranca Merge pull request #19093 from remomueller/fix-actionmailer-preview-l…
…inks-on-subdirectories

Mailer preview now uses `url_for` to fix links to emails for apps runnin...
39b0411
@kamipo kamipo Do not use options that does not support
MySQL does not support partial index. And, the create index algorithm in
create table can not be specified.
c8816b4
@kamipo kamipo More exercise the create index sql tests f380c29
Commits on May 04, 2015
@rafaelfranca rafaelfranca Merge pull request #20002 from kamipo/more_exercise_create_index_sql_…
…tests

More exercise the create index sql tests
0e7718f
@rafaelfranca rafaelfranca Remove unused private classes
The usage of these classes where removed at
8017e6a.

cc @arthurnn @senny
3297909
@rafaelfranca rafaelfranca Remove unneeded base file
We are only using for one test class
35867c0
@rafaelfranca rafaelfranca Fix generator tests
In my machine the output is different
b67197e
@rafaelfranca rafaelfranca Merge pull request #18561 from nerdcave/serialization-methods-option
method_missing fallback for ActiveModel::Serialization methods option
12d042f
@kbrock kbrock Give authentication methods the ability to customize response message.
Digest allowed the messages.
Add the same feature to basic and token
ba924a5
@rafaelfranca rafaelfranca Merge pull request #19981 from kbrock/custom_auth_html
Give authentication methods the ability to customize response message.
4261aa5
@pixeltrix pixeltrix Fix mailer previews with attachments
Use the mail gem's own API to locate the correct part.

Fixes #14435.
350d272
@pixeltrix pixeltrix Improve display of attachment names in mailer previews
Display attachment filenames as a comma separated list rather than
showing the inspect output for the array.
9f39d31
@pixeltrix pixeltrix Add support for inline images to mailer previews
Use a preview interceptor to search for inline cid: urls in src
attributes and convert them to data urls.
60239f3
@pixeltrix pixeltrix Fix railties configuration test 21c74bd
@meinac meinac refactor ActiveSupport::TestCase.test_order method with memoization bf501e7
@zamith zamith Adds/Corrects use case for adding an error message
I believe this is a use case that was supposed to be supported, and it's
a small fix.
6f418a0
@robin850 robin850 Tiny documentation edits [ci skip]
* Fix a few typos
* Wrap lines to 80 chars
* Use `+` instead of `<tt>`
a8aa8b7
@rafaelfranca rafaelfranca Merge pull request #20007 from zamith/validation-custom-messages
Adds/Corrects use case for adding an error message
bccbaef
@eprothro eprothro Updates various prose to the i18n guide
[ci skip]
eaa4378
@eprothro eprothro Enhance the "Passing Variables to Translations" part
Add more information about passing variables to translation definitions
and also merge this part with the "Interpolation" one as the latter
didn't bring any new information. Moreover, each one was referring to
the other for further information.

[ci skip]
984a4db
@sikachu sikachu Silence ambiguous first argument warning
This silences:

    actionpack/test/journey/route_test.rb:33: warning: ambiguous first
    argument; put parentheses or a space even after `/' operator
7cb9e20
@matthewd matthewd Merge pull request #20010 from sikachu/silence-ambiguous-first-argument
Silence ambiguous first argument warning
cec46fb
@rafaelfranca rafaelfranca Merge pull request #20006 from vngrs/refactor_test_order_method
refactor ActiveSupport::TestCase.test_order method with memoization
9619331
@meinac meinac deep_dup method, remove old key from duplicated hash to avoid unneces…
…sary pairs
40c7f74
@tenderlove tenderlove Merge pull request #17632 from eugeneius/schema_cache_dump_connection…
…_pool

Apply schema cache dump when creating connections
fcc4683
@pixeltrix pixeltrix Document inline image mailer preview interceptor
Explain what the interceptor is used for and how to remove it.
faaed86
@imanel imanel Handle raise flag in translate when both main and default translation…
… is missing. Fixes #19967
9c8542b
@matthewd matthewd Merge pull request #19998 from imanel/fix-missing-translation
Handle raise flag in translate when both main and default translation is missing.
a95151b
@matthewd matthewd Merge pull request #20014 from vngrs/hash_deep_dup_bug
deep_dup method, remove old key from duplicated hash
e5139f1
@matthewd matthewd Put the assertion arguments in the right order 3b1abcc