Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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 May 20, 2015
@schneems schneems Merge pull request #20215 from repinel/validates_acceptance_doc
[ci skip] add to doc that acceptance validator allows `nil` by default
07f1a50
@ronakjangir47 ronakjangir47 Updated postgresql documentation link to use latest version [ci skip] 76fbfe9
@amitsuroliya amitsuroliya Fix NetAddr link [ci skip] ac20dd7
@arunagw arunagw Merge pull request #20218 from ronakjangir47/postgresql
Updated postgresql documentation link to use latest version [ci skip]
edb0eaa
@arunagw arunagw Merge pull request #20217 from amitsuroliya/fix_netaddr_link
Fix NetAddr link [ci skip]
e00d63e
@senny senny add missing punctuation in changelog. [ci skip] 1ceeada
@karanarora karanarora typo fix [ci skip] ec8b7a5
@spastorino spastorino Merge pull request #20219 from karanarora/Typo-fix
typo fix [ci skip]
0f9ab4f
@Gaurav2728 Gaurav2728 Rails 5.0 will target Ruby 2.2+, correct rails guide example [ci skip] a9aefff
@kaspth kaspth Merge pull request #20221 from Gaurav2728/gaurav-debugging_rails_guid…
…e_update

Rails 5.0 will target Ruby 2.2+, correct rails guide example [ci skip]
5d5447b
@Gaurav2728 Gaurav2728 [ci skip] update ruby doc links; for rails next version ruby 2.2+ wil…
…l be supported only
3e238b6
@senny senny Merge pull request #20222 from Gaurav2728/gaurav-update_ruby_links
[ci skip] updated ruby doc links; for rails next version of ruby will be 2.2x
21474f1
@arunagw arunagw Fix broken link for minitest. [ci skip]
For more details see #20222
879f316
@manish-shrivastava manish-shrivastava updated Inline format at activerecord rdoc
For Inline formats, changed ` (single backticks)   to <tt> tag at active record rdoc as single backticks (`) don't work with rdoc. for inline format.
6252d0a
@rafaelfranca rafaelfranca Merge pull request #20225 from manish-shrivastava/master
updated Inline format at activerecord rdoc
66780af
@karanarora karanarora Rails documentation standard is american english. [ci skip] bb4ef33
@rafaelfranca rafaelfranca Merge pull request #20228 from karanarora/Spelling-fix
Rails documentation standard is american english. [ci skip]
85fb209
@ronakjangir47 ronakjangir47 Rails documentation standard is american english. [ci skip] 0d615c3
@rafaelfranca rafaelfranca Merge pull request #20230 from ronakjangir47/american_style
Rails documentation standard is american english. [ci skip]
6577d04
@arthurnn arthurnn Merge pull request #17788 from sivagollapalli/master
Issue#17703 Test case for tempfile attribute
c364239
@arthurnn arthurnn Merge pull request #20022 from repinel/remove-mocha1
Remove use of mocha in the railties path tests
f271f43
@davydovanton davydovanton [skip ci] Update documentation for Date class 30f8318
Commits on May 21, 2015
@radar radar Remove redundant 'Rails' from Rails::AppRailsLoader constant f9640b0
@senny senny Merge pull request #20235 from davydovanton/doc-update-date
[skip ci] Update documentation for Date class
b052a46
@y-yagi y-yagi remove reference to `div_for` method from guide [ci skip]
`div_for` removed in 01e94ef
88787e7
@kaspth kaspth Merge pull request #20244 from y-yagi/remove_div_for_from_guide
remove reference to `div_for` method from guide [ci skip]
39037b7
@davydovanton davydovanton [skip ci] Update documentation for ArrayInquirer#any? 8d1a292
@seuros seuros Merge pull request #20247 from davydovanton/doc-array-inquirer
Update documentation for ArrayInquirer#any?
448bf47
@ronakjangir47 ronakjangir47 Remove use of mocha in the railties generators tests 722a367
@fxn fxn revises a test to account for case-insensitive file systems
The patched test assumed the file system is case-sensitive, but that is not
necessarily the case. In particular, this test did not pass in the recommended
setup for the dev box, because the /vagrant shared folder is case-insensitive.

After looking at some gems that provide access to file system metadata I have
chosen to go with the check you can see in the patch because, albeit it's a bit
dirty creating a file, it is super easy to understand and clearly portable.

References rails/rails-dev-box#102.
d345ce9
@davydovanton davydovanton [skip ci] Update documentation for MemCacheStore::build_mem_cache b485eb3
@rafaelfranca rafaelfranca Merge pull request #20250 from davydovanton/doc-mem-cache-store
Update documentation for MemCacheStore::build_mem_cache [ci skip]
dc53766
@davydovanton davydovanton [skip ci] Add nodoc label for protected Cache methods 15df1dc
@rafaelfranca rafaelfranca Merge pull request #20251 from davydovanton/doc-memory-store
Add nodoc label for protected Cache methods
d13b4e2
Commits on May 22, 2015
@waynn waynn "maybe" => "may be" f25997a
@rafaelfranca rafaelfranca Merge pull request #20252 from waynn/patch-5
"maybe" => "may be"
023d50c
@eliotsykes eliotsykes Make link to configuring guide relative [ci skip] b539760
@senny senny Merge pull request #20254 from eliotsykes/link-relatively-to-configur…
…ing-guide

Make link to configuring guide relative [ci skip]
1214f0b
@eliotsykes eliotsykes Link association.exists?(...) to API docs [ci skip] 4311f05
@senny senny Merge pull request #20255 from eliotsykes/link-associations-to-exists…
…-guide

Link association.exists?(...) to AR::Base.exists? guide [ci skip]
3873fc5
@tgxworld tgxworld Remove deprecation warning. 3d4004a
@arunagw arunagw Remove broken and unused release task
- We do release with release.rb
- There is no `rake/gemcutter`
4194d05
@benpickles benpickles Omit .keep in .gitignore when generated with --skip-keeps. 46fedb4
@arunagw arunagw Remove custom `lines` and use `/tools/line_statistics` b9e0073
@kaspth kaspth Avoid E constant clashing with Minitest defined version.
Minitest sets an E constant to an empty string to save GC time.
This clashes with autoloading tests which define an E constant.
afb6a2c
@karanarora karanarora Spelling/typo/grammatical fixes [ci skip]
spelling fix [ci skip]

example to be consistent [ci skip]

grammatical fix

typo fixes [ci skip]
0750330
@zzak zzak Merge pull request #20231 from karanarora/Spelling-fix
Rails documentation standard is american english. [ci skip]
334140c
@tenderlove tenderlove move request id manipulation to the request object
this way we can keep the knowledge of `env` hash keys in one place.
42e66fa
@wojobucco wojobucco Changed mysqldump to include sprocs and functions 1b8adca
Commits on May 23, 2015
@imtayadeway imtayadeway [ci skip] Fix grammar/syntax in AR assocation basics. 2ec1fe4
@imtayadeway imtayadeway [ci skip] Use spaceship operator to indicate precedence. f2e2086
@imtayadeway imtayadeway [ci skip] Fix markdown issue in association basics docs.
The quoted underscore is being intepreted as markdown, causing the
entire phrase to be italicized.
5a81779
@gaurish gaurish Add bang version to OrderedOptions
By:
Aditya Sanghi(@asanghi)
Gaurish Sharma(gaurish)
e768c51
@prathamesh-sonpatki prathamesh-sonpatki Remove div_for from guides [ci skip]
 Followup of #20244.
d3da208
@arunagw arunagw Merge pull request #20275 from prathamesh-sonpatki/remove-div-for-fro…
…m-guides

 Remove div_for from guides [ci skip]
989296f
@tenderlove tenderlove add a branch to eliminate multiple nil checks
if we add an else conditional to the `presence` check, we can eliminate
the second `||` branch in the caller
cf985d1
@tenderlove tenderlove remove useless ivar
I should have deleted this earlier with 42e66fa
c10630b
@dleve123 dleve123 Reword a sentence about GH Issues in contributing guide.
[skip ci]

"Everyone's Issues" read pretty weird to me, specifically
the use of capitalization. I changed the link text
to be "issue list", which seems to better "go with
the flow", IMHO.
1cb9407
@dleve123 dleve123 Reword sentences in contributing docs for clarity.
[skip ci]

- removes use "squash" where it doesn't apply to git
- "is a help" -> "helps"
- "if your comment simply says" -> "... simply reads"
0fcef17
@y-yagi y-yagi use keyword arguments in HTTP request methods of assert_difference ex…
…ample [ci skip]
aa8672a
Commits on May 24, 2015
@claudiob claudiob Merge pull request #20278 from dleve123/cleanup-contributing-docs-sec…
…tion

Cleanup docs for contributing to rails docs
281581f
@zzak zzak Merge pull request #20279 from y-yagi/assert_difference_example
use keyword arguments in HTTP request methods of assert_difference example [ci skip]
d6f59ea
@akshay-vishnoi akshay-vishnoi Remove `.superclass_delegating_accessor`. Refer #14271 20c1484
@spastorino spastorino Merge pull request #20260 from tgxworld/remove_deprecation_warning
Remove deprecation warning.
fee3459
@spastorino spastorino Merge pull request #20265 from benpickles/gitignore-keeps
Omit .keep in .gitignore when generated with --skip-keeps.
9882f9e
@claudiob claudiob Merge pull request #20270 from imtayadeway/tw/association-basics-docs
association basics docs fixes
c2ded92
@davydovanton davydovanton [skip ci] Add documentation for DeprecatedConstantProxy#class f671cbe
@zzak zzak Merge pull request #20282 from davydovanton/doc-proxy-wrappers
Add documentation for DeprecatedConstantProxy#class
53592a5
@zzak zzak s/contstant/constant re #20282 [ci skip] c0c90af
@davydovanton davydovanton [skip ci] Add documentation for Deprecation::Behavior module 0f53b01
@seuros seuros Merge pull request #20286 from davydovanton/doc-deprecation-behavior
Add documentation for Deprecation::Behavior module
ac1368a
Commits on May 25, 2015
@brian-davis brian-davis Grammar fix to Active Record Basics guide. [ci skip] 55c79e6
@zzak zzak Merge pull request #20288 from brian-davis/brian-davis
Grammar fix to Active Record Basics guide. [ci skip]
6a07404
@zzak zzak Add missing type reference here 83d0252
@zzak zzak Merge branch 'master' of github.com:rails/rails d0a370e
@yoongkang yoongkang Fix spelling mistakes f55fe55
@davydovanton davydovanton [skip ci] Update documentation for Duration#to_s 2c72589
@kaspth kaspth Merge pull request #20293 from davydovanton/doc-duration
Update documentation for Duration#to_s
7a08b2c
@rafaelfranca rafaelfranca Merge pull request #20294 from yoongkang/american_spelling
Fix spelling mistakes
f4fb483
@rafaelfranca rafaelfranca Merge pull request #20248 from ronakjangir47/remove_mocha
Remove use of mocha in the railties generators tests
5e92f90
@rohandaxini rohandaxini Fixed the grammatical mistake in the sentence [ci skip] 498ff48
@seuros seuros Merge pull request #20295 from rohandaxini/patch-1
Fixed the grammatical mistake in the sentence [ci skip]
88c883b
@meinac meinac Use memoization while accessing request headers for minimizing memory…
… usage
b197a1a
@matthewd matthewd Merge pull request #20296 from vngrs/use_memoization_to_minimize_memo…
…ry_usage

Use memoization while accessing request headers for minimizing memory usage
2d261ba
Commits on May 26, 2015
@gouravtiwari gouravtiwari Added multibyte slice! example to doc [ci skip] 379e07e
@senny senny Merge pull request #16938 from akshay-vishnoi/remove-deprication
Remove `.superclass_delegating_accessor`.
b8c31fd
@meinac meinac Remove redundant 'like' from doc of slice! method [ci skip] 4355725
@senny senny deprecate `Relation#uniq` use `Relation#distinct` instead.
See #9683 for the reasons we switched to `distinct`.

Here is the discussion that triggered the actual deprecation #20198.

`uniq`, `uniq!` and `uniq_value` are still around.
They will be removed in the next minor release after Rails 5.
adfab2d
@arunagw arunagw Remove unused variable
Was left in adfab2d
e56bdf3
@senny senny Merge pull request #20304 from arunagw/aa-remove-unused-variable
Remove unused variable
e5a3952
@senny senny Merge pull request #20303 from vngrs/remove_redundant_like_from_slice…
…_doc

Remove redundant 'like' from doc of slice! method [ci skip]
31cc1c2
@keepcosmos keepcosmos add `extend` option on `has_and_belongs_to_many`. 995a473
@senny senny Merge pull request #20027 from keepcosmos/add-extend-option-on-habtm
Add `extend` option on `has_and_belongs_to_many`.
a19200d
@stephen-puiszis stephen-puiszis Add info on default layout functionality 3.2 >> 4.0 upgrade a48b4ea
@rafaelfranca rafaelfranca Merge pull request #20309 from stephen-puiszis/patch-1
Add info on default layout functionality 3.2 >> 4.0 upgrade
290c9e3
@meinac meinac Add missing nodocs and docs for ActionDispatch::Request [ci skip]
add missing dot to end of the doc
096bc4b
@rafaelfranca rafaelfranca Merge pull request #20305 from vngrs/missing_docs_and_no_docs_for_act…
…ion_dispatch_request

Add missing nodocs and docs for ActionDispatch::Request [ci skip]
58ed699
@rafaelfranca rafaelfranca Merge pull request #20208 from gaurish/raise_on_missing_ordered_options
Add bang version to OrderedOptions
b1f6be9
@guigs guigs Fix email with name format in Guides. [ci skip] ac6180e
@rafaelfranca rafaelfranca Merge pull request #20310 from guigs/patch-1
Fix email with name format in Guides. [ci skip]
79fb8f3
@claudiob claudiob Merge pull request #20297 from gouravtiwari/patch-9
Added multibyte slice! example to doc [ci skip]
8887449
Commits on May 27, 2015
@kamipo kamipo If specify `strict: :default` explicitly, do not set sql_mode.
Related with #17370.
7961f4f
@senny senny Merge pull request #20262 from arunagw/aa-remove-broken-unused-releas…
…e-task

Remove broken and unused release task
8524608
@meinac meinac Documentation for ActionDispatch::Request form_data? method [ci skip] 98dd795
@meinac meinac Add assertion for get? method into test cases 01d4e06
@spastorino spastorino Merge pull request #20314 from vngrs/add_doc_about_form_data_method
Documentation for ActionDispatch::Request form_data? method [ci skip]
4a7bf07
@meinac meinac Fix indentation warning on active_support ordered_options 8b7bb52
@kassio kassio Remove web-console and spring from test group on default Gemfile. ac8356e
@rafaelfranca rafaelfranca Merge pull request #20319 from kassio/master
Remove web-console and spring from test group on default Gemfile.
8acf0cc
@jakegavin jakegavin Remove unnecessary reference to example Blog app [ci skip] c9f05c9
@claudiob claudiob Merge pull request #20323 from jakegavin/initialization-guide-update
Remove unnecessary reference to example Blog app in initialization guides
ffa20f1
@rafaelfranca rafaelfranca Merge pull request #20321 from vngrs/fix_indentation_warning
Fix indentation warning on active_support ordered_options
1f8a9d9
@rafaelfranca rafaelfranca Merge pull request #20316 from vngrs/add_assertion_for_get_method_int…
…o_request_test

Add assertion for get? method into test cases
3e36db4
Commits on May 28, 2015
@hderms hderms add fixed file
add framework_test

add another test
ae5c3c3
@yoongkang yoongkang [ci skip] Replace dead link about HttpOnly cookies. ad6e508
@zzak zzak Merge pull request #20327 from yoongkang/ajax
[ci-skip] Replace dead link about HttpOnly cookies.
7a9651c
@rafaelfranca rafaelfranca Merge pull request #19867 from radar/rename-app-rails-loader
Remove redundant 'Rails' from Rails::AppRailsLoader constant
99c042b
@rafaelfranca rafaelfranca Merge pull request #19808 from byroot/action-parameter
[PoC] Stop shadowing parameters named `action`
f02f287
@rafaelfranca rafaelfranca Fix file name
This is a leftover of #19867
6b1e67e
@rafaelfranca rafaelfranca :bomb: Fix another leftover 4b606d0
@rafaelfranca rafaelfranca Merge pull request #20326 from hderms/dh/fix_task_bug
Fix rake method definition leaking onto Object
a75f6cf
@rafaelfranca rafaelfranca Merge pull request #20269 from wojobucco/master
Changed mysqldump to include sprocs and functions
27fdf45
@georgeclaghorn georgeclaghorn Resolve enums in test fixtures
Currently, values for columns backing Active Record enums must be
specified as integers in test fixtures:

    awdr:
      title: "Agile Web Development with Rails"
      status: 2

    rfr:
      title: "Ruby for Rails"
      status: <%= Book.statuses[:proposed] %>

This is potentially confusing, since enum values are typically
specified as symbols or strings in application code. To resolve the
confusion, this change permits the use of symbols or strings to specify
enum values:

    awdr:
      status: :published

It is compatible with fixtures that specify enum values as integers.
908cfef
@rafaelfranca rafaelfranca Merge pull request #17654 from kamipo/strict_mode_explicitly
If specify `strict: :default` explicitly, do not set sql_mode.
c68e45d
@rafaelfranca rafaelfranca Merge pull request #19886 from henders/henders/reload_wipe_query_cache
Cause ActiveRecord::Base::reload to also ignore the QueryCache.
1ed92a2
@EduardoBautista EduardoBautista Add application/vnd.api+json alias to the JSON MIME Type. 50b6631
@rafaelfranca rafaelfranca Merge pull request #20171 from georgeclaghorn/enums-in-fixtures
Allow the use of symbols or strings to specify enum values in test fixtures
d81f147
@rafaelfranca rafaelfranca Merge pull request #20329 from EduardoBautista/json-api-support
Add application/vnd.api+json alias to the JSON MIME Type.
902360b
@akshay-vishnoi akshay-vishnoi Add collation support for string and text columns in SQLite3 3932912
@jnraine jnraine Allow Relation#compact using delegation 57daaef
@rafaelfranca rafaelfranca Add test to 57daaef add9500
@rafaelfranca rafaelfranca Merge pull request #20041 from akshay-vishnoi/sqlite_collation
SQLite3: Add collation support for string and text columns
8cc5150
@rafaelfranca rafaelfranca Merge pull request #20263 from arunagw/aa-remove-custom-lines-actionview
Remove custom `lines` and use `/tools/line_statistics`
be18476
@huoxito huoxito Properly append preload / includes args on Merger
Couldn't find other way to get the association name from a given class
other than looping through `reflect_on_all_associations` reflections ..

Noticed this one while looking at this example:

```ruby
class Product < ActiveRecord::Base
  has_many :variants
  has_many :translations
end

class Translation < ActiveRecord::Base
  belongs_to :product
end

class Variant < ActiveRecord::Base
  belongs_to :product
end

class BugTest < Minitest::Test
  def test_merge_stuff
    product = Product.create! name: 'huhu'
    variant = Variant.create! product_id: product.id
    Translation.create! locale: 'en', product_id: product.id

    product_relation = Product.all
                              .preload(:translations)
                              .joins(:translations)
                              .merge(Translation.where(locale: 'en'))
                              .where(name: 'huhu')

    assert_equal variant, Variant.joins(:product).merge(product_relation).first
  end
end
```
a01d164
@rafaelfranca rafaelfranca Merge pull request #20196 from huoxito/preload-association-and-merges
Properly append preload / includes args on Merger
7cc9754
@arunagw arunagw Remove unused package tasks
We are using `all:build` now.
21b6b68
@eliotsykes eliotsykes config.static_index configures directory index "index.html" filename
Set `config.static_index` to serve a static directory index file not
named `index`. For example, to serve `main.html` instead of `index.html`
for directory requests, set `config.static_index` to `"main"`.
3ff3949
@henders henders Give credit to extra contributor for Base.reload fix 87b07ef
@arunagw arunagw Merge pull request #20332 from henders/shender/changelog_reload_credit
Give credit to extra contributor for Base.reload fix
207f8fc
@meinac meinac Deprecate `:nothing` option for render method
`head` method works similar to `render` method with `:nothing` option
44781b6
@s3ymd s3ymd [ci skip] Fix block parameter of assert_no_difference a227e88
@spastorino spastorino Merge pull request #20336 from vngrs/deprecate_nothing_option_for_ren…
…der_method

Deprecate `:nothing` option for render method
172e452
@arthurnn arthurnn Merge pull request #20313 from s3ymd/master
[ci skip] Fix block parameter of assert_no_difference
0920576
@meinac meinac Remove already defined methods in super class of ActionDispatch::Requ…
…est class

These methods had defined in 2004 by dhh in initial commit and `ActionDispatch::Request`
class has been inherited from `Rack::Request` class in 2009 by josh.
In 2014 these methods and more of them defined in `Rack::Request` class
so we don't need them anymore in rails codebase.
9a16a29
@jcockhren jcockhren removed erroneous line. Corrected presence validation example.
Addresses #20343.
Removes erroneous line of code in the sample codeblock.
d30f001
@laurocaetano laurocaetano Merge pull request #20344 from jcockhren/fix_docs_presence_validation
removed erroneous line. Corrected presence validation example.
3b72789
@rafaelfranca rafaelfranca Merge pull request #20331 from arunagw/arunagw-remove-unused-package-…
…tasks

Remove unused package tasks
233ceda
@rafaelfranca rafaelfranca Merge pull request #20017 from eliotsykes/configurable-static-index-f…
…ilename

config.static_index configures directory Index "index.html" filename
73aab03
@sgrif sgrif Allow proc defaults with the Attributes API
This is a variant implementation of the changes proposed in #19914.
Unlike that PR, the change in behavior is isolated in its own class.
This is to prevent wonky behavior if a Proc is assigned outside of the
default, and it is a natural place to place the behavior required by #19921
as well.

Close #19914.

[Sean Griffin & Kir Shatrov]
a6e3cda
@sgrif sgrif Persist user provided default values, even if unchanged
This is a usability change to fix a quirk from our definition of partial
writes. By default, we only persist changed attributes. When creating a
new record, this is assumed that the default values came from the
database. However, if the user provided a default, it will not be
persisted, since we didn't see it as "changed". Since this is a very
specific case, I wanted to isolate it with the other quirks that come
from user provided default values. The number of edge cases which are
presenting themselves are starting to make me wonder if we should just
remove the ability to assign a default, in favor of overriding
`initialize`. For the time being, this is required for the attributes
API to not have confusing behavior.

We had to delete one test, since this actually changes the meaning of
`.changed?` on Active Record models. It now specifically means
`changed_from_database?`. While I think this will make the attributes
API more ergonomic to use, it is a subtle change in definition (though
not a backwards incompatible one). We should probably figure out the
right place to document this. (Feel free to open a PR doing that if
you're reading this).

/cc @rafaelfranca @kirs @senny

This is an alternate implementation of #19921.

Close #19921.

[Sean Griffin & Kir Shatrov]
2f9d889
@repinel repinel Remove use of mocha from Active Model 5a6ae7f
Commits on May 29, 2015
@repinel repinel Fix the shadowing warning for `reflection` 9b986ea
@kddeisz kddeisz Add Enumerable#pluck.
Allows fetching the same values from arrays as from ActiveRecord associations.
d909211
@rafaelfranca rafaelfranca Merge pull request #20347 from repinel/fix-reflection-shadowing
Fix the shadowing warning for `reflection`
9aa416d
@rafaelfranca rafaelfranca Merge pull request #20350 from kddeisz/enumerable_pluck
Add Enumerable#pluck.
57f51f0
@rafaelfranca rafaelfranca Merge pull request #20267 from kaspth/fix-minitest-constant-clashing
Avoid E constant clashing with Minitest defined version.
10719e1
@rafaelfranca rafaelfranca Merge pull request #20346 from repinel/remove-mocha2
Remove use of mocha from Active Model
b8b7c2f
@rafaelfranca rafaelfranca Merge pull request #20341 from vngrs/remove_already_defined_methods_i…
…n_rack_request

Remove already defined methods in super class of ActionDispatch::Request class
3a8656b
@kddeisz kddeisz Updating the guides for Enumerable#pluck d8f1635
@rafaelfranca rafaelfranca Merge pull request #20351 from kddeisz/enumerable_pluck
Updating the guides for Enumerable#pluck
d5c93ca
@rafaelfranca rafaelfranca Use bundler < 1.10 until its bugs are fixed 81b4297
@rafaelfranca rafaelfranca Uninstall bundler 1.10 410d246
@rafaelfranca rafaelfranca Force the uninstall 9ff901b
@rafaelfranca rafaelfranca Merge pull request #19878 from pabloh/replace_alias_chains_with_prepend
Replace use of alias chains with prepend at core_ext/date and core_ext/time
6e83a13
@segiddins segiddins Revert "Force the uninstall"
This reverts commit 9ff901b.
76f0cdb
@segiddins segiddins Revert "Uninstall bundler 1.10"
This reverts commit 410d246.
950b06b
@arunagw arunagw Fix warning about ambiguous first argument fbe41a2
@segiddins segiddins Revert "Use bundler < 1.10 until its bugs are fixed"
This reverts commit 81b4297.
be50118
@segiddins segiddins Generate Bundler 1.10.1 lockfile 783637e
@senny senny Merge pull request #20354 from arunagw/fix-warning-ambiguous-first-ar…
…gument

Fix warning about ambiguous first argument
3bbde98
@tgxworld tgxworld Remove unused code.
Code was moved into the `assign` method.
4abb8c9
@spastorino spastorino Merge pull request #20358 from tgxworld/remove_code
Remove unused code.
d9695a6
@spastorino spastorino Merge pull request #20355 from segiddins/seg-bundler-1-10
Bundler 1.10 should work now!
f555911
@ernie ernie Update docs for ActiveRecord `serialize`
For certain column types, using `serialize` is unnecessary, or the user
may get unexpected contents back from the DB adapter (which is handling
some basic deserialization for them). Call this out in the
documentation.

For background, see:

    https://gist.github.com/ernie/33f75f2294885b9806f9
    https://twitter.com/erniemiller/status/604262907442905090
bbdcbbc
@sgrif sgrif Merge pull request #20364 from ernie/update-serialize-docs
Update docs for ActiveRecord `serialize`

[ci skip]
343dad9
@kddeisz kddeisz Allow Enumerable#pluck to take a splat.
This allows easier integration with ActiveRecord, such that
AR#pluck will now use Enumerable#pluck if the relation is loaded,
without needing to hit the database.
777fa25
@Gaurav2728 Gaurav2728 not require mail file
  ```
  it added in this commit (2a25c4c), now no warnings occur.
  ```
baa773a
@repinel repinel Revert "Replace use of alias chains with prepend at core_ext/date and…
… core_ext/time"
af1a617
@matthewd matthewd Merge pull request #20366 from Gaurav2728/gaurav-mailer
  not require mail file
39b45ac
@rafaelfranca rafaelfranca Merge pull request #20365 from repinel/revert-19878-replace_alias_cha…
…ins_with_prepend

Revert "Replace use of alias chains with prepend at core_ext/date and…
f7c0d13
@manishspuri manishspuri Update inline_preview_interceptor.rb ac02df5
@manishspuri manishspuri minor text change 9575f4f
@rafaelfranca rafaelfranca Merge pull request #20367 from manishspuri/master
minor text change [ci skip]
754ca97
@rafaelfranca rafaelfranca Make the wording less confusing
This partially reverts commit ac02df5.

[ci skip]
b42d770
unknown formatting changes 3833d45
@kaspth kaspth Merge pull request #20370 from manishspuri/master
formatting changes
f06605d
@rafaelfranca rafaelfranca Require yaml for isolation test
It was removed when we removed mocha at
5a6ae7f
109e71d
Commits on May 30, 2015
@tgxworld tgxworld Remove `assigns` and `assert_template`. ca83436
@yoongkang yoongkang [ci skip] match without via is now deprecated 9c93b8c
@yoongkang yoongkang `rake restart` should work without a `tmp` folder
In restart.rake, the creation of tmp/restart.txt
would fail if the tmp folder does not exist in the
app. This is a problem because apps cloned using
git would not have the tmp folder, as the folder is
in .gitignore. This commit creates the tmp folder
if it does not exist.

Fixes #20299

[Yoong Kang Lim, Sunny Juneja]
6fc83f8
@yoongkang yoongkang Generate a `.keep` file in `tmp` folder
A lot of scripts assumes the existence of this folder and most would fail if it
is absent.

One example of this is `rake restart` (before the previous commit) – it tries to
`touch tmp/restart.txt`, which would fail if `tmp` does not exist, which was the
case for a freshly-cloned project as `tmp` is `.gitignored` by default.

See #20299.

[Yoong Kang Lim, Sunny Juneja]
f06ce4c
@yoongkang yoongkang Add test to ensure tmp:clear works when tmp is missing
See #20299.
0cb327c
@chancancode chancancode Merge pull request #20370 from manishspuri/master
Add tmp directory before touching
d7cbdbe
@claudiob claudiob Merge pull request #20375 from yoongkang/docfix
[ci skip] match without via is now deprecated
534ca83
@meinac meinac match method doc fix [ci skip]
match method without setting `:via` option has been deprecated

fix minor typo
68aafd6
@kaspth kaspth Merge pull request #20378 from vngrs/fix_doc_of_match_method
match method doc fix [ci skip]
eefd4c0
@kamipo kamipo Add CHANGELOG entry for #17654 [ci skip] e5e3ec2
@eileencodes eileencodes Merge pull request #20380 from kamipo/add_changelog_for_17654
Add CHANGELOG entry for #17654
50914b9
@kaspth kaspth Replace expectation with state check.
The tests would still pass if the cache call in the rendered templates were removed.
4abe29d
@sgrif sgrif Add docs and changelog entry for 73aab03 [ci skip] 6bd2573
@sgrif sgrif Ensure symbols passed to `select` are always quoted
Our general contract in Active Record is that strings are assumed to be
SQL literals, and symbols are assumed to reference a column. If a from
clause is given, we shouldn't include the table name, but we should
still quote the value as if it were a column.

Upon fixing this, the tests were still failing on SQLite. This was
because the column name being returned by the query was `"\"join\""`
instead of `"join"`. This is actually a bug in SQLite that was fixed a
long time ago, but I was using the version of SQLite included by OS X
which has this bug. Since I'm guessing this will be a common case for
contributors, I also added an explicit check with a more helpful error
message.

Fixes #20360
0ef7e73
@jonatack jonatack Fix regression in #20017: wrong number of arguments error
and use coherent quoting/spacing.

This should hopefully fix a regression that was introduced with #20017,
causing deployment pushes to Heroku to be rejected with the following
trace:

ArgumentError: wrong number of arguments (2 for 3)
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tatic.rb:16:in `initialize'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem
s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in
`new'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/gem
s/heroku-deflater-0.5.3/lib/heroku-deflater/serve_zipped_assets.rb:15:in
`initialize'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:43:in `new'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:43:in `build'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:118:in `block in build'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:118:in `each'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:118:in `inject'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/actionpack/lib/action_dispatch/middleware/s
tack.rb:118:in `build'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/engine.rb:509:in `app'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application/finisher.rb:
34:in `block in <module:Finisher>'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in
`instance_exec'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:30:in
`run'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:55:in
`block in run_initializers'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/initializable.rb:54:in
`run_initializers'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/vendor/bundle/ruby/2.2.0/bun
dler/gems/rails-0ef7e73f0af7/railties/lib/rails/application.rb:352:in
`initialize!'
remote:
/tmp/build_a3b8845b716508af12d99859d1a58c5c/config/environment.rb:5:in
`<top (required)>'
b7b75e0
Commits on May 31, 2015
@sgrif sgrif Attempt to fix travis failures
The version of SQLite used by Travis is outdated. We need to install a
newer version.
0b34b79
@yoongkang yoongkang Fix circular import warning on build 179b9f6
@y-yagi y-yagi set engine's route in the functional test is generated in the engine 6a8d918
@senny senny minor formatting changes in changelogs. [ci skip] b25436a
@senny senny no rails command short-cuts in the getting-started guide. [ci skip]
The full command name is more expressive.
1a4f470
@y-yagi y-yagi add engine's namespace to fixture name c861ef2
@eileencodes eileencodes Use `any?` rather than `present?` to check args
It's better to use Ruby methods when possible over methods defined by
Active Support because then it does not need to rely on any
dependencies.
f6b01c1
Commits on Jun 01, 2015
@equiamos equiamos Fixed typos. [ci skip] 78ad5fa
@zzak zzak Merge pull request #20392 from equiamos/equiamos-fix-typos-docs
Fixed typos [ci skip]
beadad4
@yui-knk yui-knk [ci skip] Fix `above` -> `below` 20ee4d0
@arunagw arunagw Merge pull request #20393 from yui-knk/fix/guide2
[ci skip] Fix `above` -> `below`
efd3d20
@nkondratyev nkondratyev Remove description of `dependency_loading` option
This option has been removed in e6747d8

[ci skip]
19ede1f
@kaspth kaspth Merge pull request #20396 from nkondratyev/fix-guides
Remove description of `dependency_loading` option
c4cb751
@nkondratyev nkondratyev Fix a range of values for parameters of the Time#change
Passing 999999000 < `:nsec` < 999999999 and 999999 < `:usec` < 1000000
to change a time with utc_offset doesn't throw an `ArgumentError`.
d989280
@mechanicles mechanicles [ci skip] Used 'instance_variables' in example for consistency.
- Found that checking instance_variables elements using string object
  gives us 'false' value.
  `instance_variables.include? "@articles" # => false`
- Used only 'instance_variables' instead of using '.include?' on it. So
  that it will return recent instance variables list.
11fecaf
@phoet phoet actually test what the name says 90918b5
@phoet phoet allow `Bearer` as well as `Token` 4b4e890
@matthewd matthewd Merge pull request #20394 from mechanicles/use-sym
[ci skip] Used 'instance_variables' in example for consistency.
6457fbf
@davydovanton davydovanton [skip ci] Update documentation for QueueAdapters::lookup 528efcb
@senny senny Merge pull request #20371 from davydovanton/doc-adapter-lookup
Update documentation for QueueAdapters::lookup [ci skip]
2db8414
@yahonda yahonda Map :bigint as NUMBER(19) sql_type by using `:limit => 19` for Oracle
since NUMBER(8) is not enough to store the maximum number of bigint.
Oracle NUMBER(p,0) as handled as integer
because there is no dedicated integer sql data type exist in Oracle database.

Also NUMBER(p,s) precision can take up to 38. p means the number of digits, not the byte length.
bigint type needs 19 digits as follows.

	$ irb
	2.2.2 :001 > limit = 8
	 => 8
	2.2.2 :002 > maxvalue_of_bigint = 1 << ( limit * 8 - 1)
	 => 9223372036854775808
	2.2.2 :003 > puts maxvalue_of_bigint.to_s.length
	19
	 => nil
	2.2.2 :004 >
a9e6e6e
@takiy33 takiy33 Use --no-document option instead of --no-rdoc and --no-ri option c7eba12
@rafaelfranca rafaelfranca Merge pull request #20403 from takiy33/patch-1
Use --no-document option instead of --no-rdoc and --no-ri option
57e19e9
@rafaelfranca rafaelfranca Merge pull request #20401 from yahonda/master_bigint_as_limit_19_in_o…
…racle

Map :bigint as NUMBER(19) sql_type by using `:limit => 19` for Oracle
1bfa81b
@rafaelfranca rafaelfranca Merge pull request #20386 from yoongkang/circular_import
Fix circular import warning on build
b8e8b67
@rafaelfranca rafaelfranca Merge pull request #20398 from nkondratyev/fix-time-change
Fix a range of values for parameters of the Time#change
03ddab0
@rafaelfranca rafaelfranca Merge pull request #20284 from kaspth/fix-caching-test
Move expectation to instance level.
bd83caa
@rafaelfranca rafaelfranca Merge pull request #20138 from tgxworld/deprecated_assert_template
Deprecate `assert_template` and `assigns()`.
bdfc662
@phoet phoet add changelog entry 4d4440c
@rafaelfranca rafaelfranca Merge pull request #20362 from kddeisz/enumerable_pluck
Allow Enumerable#pluck to take a splat.
4e63bde
@rafaelfranca rafaelfranca Merge pull request #19094 from phoet/have_bearer_be_valid_as_well
Have Bearer be valid as well
cf484e3
@manish-shrivastava manish-shrivastava Fixed typos in guide 8145880
@rafaelfranca rafaelfranca Merge pull request #20405 from manish-shrivastava/master
Fixed typos in rails guide
a4cf371
@yoongkang yoongkang Use sprockets-rails from github repo
See #20397
757dd93
@ronakjangir47 ronakjangir47 Removed use of mocha from railties actions_test 655b8be
@spastorino spastorino Merge pull request #20406 from yoongkang/add_edge_sprockets
Use sprockets-rails from github repo
651fa5e
@rafaelfranca rafaelfranca Merge pull request #20357 from ronakjangir47/remove_mocha1
Removed use of mocha from railties actions_test
8b67f28
@davydovanton davydovanton [skip ci] Add documentation for QueueAdapter::queue_adapter 455e44c
@seuros seuros Merge pull request #20409 from davydovanton/doc-queue-adapter
Add documentation for QueueAdapter::queue_adapter
f40ccb5
Commits on Jun 02, 2015
@y-yagi y-yagi add test to run generated test files inside mountable engine 3612793
@schneems schneems Use block variable instead of global
```ruby
require 'benchmark/ips'

Benchmark.ips do |x|
  x.report("$&") {
    "foo".sub(/f/) { $&.upcase }
  }
  x.report("block var") {
    "foo".sub(/f/) {|match| match.upcase }
  }
end

```

```
Calculating -------------------------------------
                  $&    48.658k i/100ms
           block var    49.666k i/100ms
-------------------------------------------------
                  $&    873.156k (± 9.3%) i/s -      4.331M
           block var    969.744k (± 9.2%) i/s -      4.818M
```

It's faster, and gets rid of a few "magic" global variables
e1a7260
@rafaelfranca rafaelfranca Merge pull request #20410 from schneems/schneems/boo-global-vars
Use block variable instead of global
c87cce1
@kddeisz kddeisz Fix postgresql DISTINCT requirement in pluck test 2dd95a7
@senny senny Merge pull request #20413 from kddeisz/pluck_postgres_fix
Fix postgresql DISTINCT requirement in pluck test
de412ee
@sgrif sgrif Skip test that fails from outdated sqlite3 on travis b6b1390
@senny senny Merge pull request #20387 from y-yagi/fix_engine_generated_controller…
…_test

set engine's route in the functional test is generated in the engine
939d5a4
@spastorino spastorino Merge pull request #20383 from jonatack/fix-configurable-static-index…
…-filename

Fix regression in #20017 wrong number of arguments error
4519727
@rafaelfranca rafaelfranca Revert "Merge pull request #19685 from vngrs/actionview_parent_layout…
…_bug"

This reverts commit a9d58c7, reversing
changes made to 041c2c8.

Reason: The old behavior is how it was working in previous version of
Rails since 4.0.x so it is not safe to backport to a stable branch.

See #19626 (comment)
and #15050 (comment)
8193a09