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 Mar 31, 2015
@yui-knk yui-knk [ci skip] Remove unnecessary `>` 65200a3
@kirs kirs Suggest new hash syntax in testing guide 487aa51
@kirs kirs New test runner syntax in testing guide 851621b
@kirs kirs No need to mention unit tests in testing guide anymore afbd655
@yui-knk yui-knk [ci skip] Replace `query methods` with `a predicate` fd94aa4
@arthurnn arthurnn Merge pull request #19596 from yui-knk/fix/comment_alias_attribute
[ci skip] Replace `query methods` with `a predicate`
bb4e385
@y-yagi y-yagi remove extra newline from ApplicationJob template 655273c
@carlosantoniodasilva carlosantoniodasilva Merge pull request #19599 from y-yagi/application_job_template
remove extra newline from ApplicationJob template
4185e84
@rafaelfranca rafaelfranca Make method as nodoc since we are already docummenting at AbstractAda…
…pter
c8bd12c
@mechanicles mechanicles Fix eager loading association using default_scope for finder methods.
- Eager loading was not working for the default_scope (class method)
  for 'find' & 'find_by' methods.
- Fixed these by adding a new check 'respond_to?(:default_scope)'.
4596e16
@eliotsykes eliotsykes Remove unused subdir deployment considerations section [ci skip] d402268
@rafaelfranca rafaelfranca Merge pull request #19603 from eliotsykes/remove-considerations-section
Remove unused subdir deployment considerations section [ci skip]
7f6af33
@rafaelfranca rafaelfranca Merge pull request #19586 from mechanicles/fix-eager-loading-for-find…
…-methods

Fix eager loading association using default_scope for finder methods.
baa176e
Commits on Apr 01, 2015
@aaronjensen aaronjensen Only coerce time when comparing if necessary
In dev, ActiveSupport::FileUpdateChecker#max_mtime triggers many
time comparisons. Time#to_time is quite a bit slower than not doing it,
so we should avoid it if possible.
9769860
@rafaelfranca rafaelfranca Merge pull request #19604 from aaronjensen/speed-up-time-coercion
Only coerce time when comparing if necessary
e3e28e4
@1337807 1337807 Update routing.md
This adds instructions for routing to rack applications with mount instead of match.

I just spent an unreasonable amount of time staring at this, hopefully the next person will save some time. It's possible that the docs should simply advise people to use mount and leave out the match method but I don't know enough about the differences in the two approaches to assert that definitively.
21a2d9a
@rafaelfranca rafaelfranca Merge pull request #19605 from 1337807/patch-1
Update routing.md
a6ecc06
@yui-knk yui-knk [ci skip] Fix `:having` option with `having` method 8f73c3f
@rafaelfranca rafaelfranca Merge pull request #19606 from yui-knk/fix/query_md
[ci skip] Fix `:having` option with `having` method
69881fb
@yui-knk yui-knk [ci skip] Add `:` 66bf962
@yui-knk yui-knk [ci skip] Remove unnecessary lines 0f26977
@rousisk rousisk [ci skip] fix guides example on arbitrary SQL execution 8f09230
@rafaelfranca rafaelfranca Merge pull request #19607 from rousisk/docs_sql_execute_correction
[ci skip] fix guides example on arbitrary SQL execution
dd39c96
@yui-knk yui-knk [ci skip] Replace `reraised` with `not captured` a21a819
@davydovanton davydovanton [skip ci] Add information about #link_to target option fd9d731
@seuros seuros Merge pull request #19609 from davydovanton/docs-add-target-blank-info
[skip ci] Add information about #link_to target option
f0590c4
@seuros seuros Merge pull request #19610 from yui-knk/fix/suppress
[ci skip] Replace `reraised` with `not captured`
c91581f
@carlosantoniodasilva carlosantoniodasilva Remove old mri platform entries from our Gemfile
Since we now only support Ruby 2.2+, we can safely remove the old mri
entries from the Gemfile.

This also allows us not to lock to a specific bundler version, since
:mri_22 was defined only on 1.7.11.

Closes #19611.
4ba1376
@brainopia brainopia Prefer string patterns for gsub
ruby/ruby#579 - there is a new optimization
since ruby 2.2

Previously regexp patterns were faster (since a string was converted to
regexp underneath anyway). But now string patterns are faster and
better reflect the purpose.

  Benchmark.ips do |bm|
    bm.report('regexp') { 'this is ::a random string'.gsub(/::/, '/') }
    bm.report('string') { 'this is ::a random string'.gsub('::', '/') }
    bm.compare!
  end
  # string: 753724.4 i/s
  # regexp: 501443.1 i/s - 1.50x slower
cdac52e
@brainopia brainopia Freeze static arguments for gsub 58d75fd
Commits on Apr 02, 2015
@jeremy jeremy Merge pull request #19616 from brainopia/speed_up_gsub
Prefer string patterns for gsub
a05f3e5
@strzibny strzibny Do not depend on Rails git repository layout in ActiveSupport tests 097ac20
@koenpunt koenpunt remove duplicates 9452dc9
Commits on Apr 03, 2015
@iainbeeston iainbeeston Raise ArgumentError if an unrecognised callback is skipped
At present, if you skip a callback that hasn't been defined,
activesupport callbacks silently does nothing. However, it's easy to
mistype the name of a callback and mistakenly think that it's being
skipped, when it is not.

This problem even exists in the current test suite.
CallbacksTest::SkipCallbacksTest#test_skip_person attempts to skip
callbacks that were never set up.

This PR changes `skip_callback` to raise an `ArgumentError` if the
specified callback cannot be found.
d287614
@matthewd matthewd Merge pull request #19627 from koenpunt/patch-1
remove duplicates
90acb66
@matthewd matthewd Merge pull request #19625 from strzibny/fix-test-rails-git-layout
Do not depend on Rails git repository layout in ActiveSupport tests
ca14f11
@matthewd matthewd Merge pull request #19429 from mxhold/print_bundle_install_output_lin…
…e_by_line

Print `bundle install` output in `rails new` as soon as it's available
faa37c7
@davydovanton davydovanton [skip ci] Update information about #link_to attributes dd2be69
@kaspth kaspth Merge pull request #19636 from davydovanton/docs-update-link-to-attri…
…butes

[skip ci] Update information about #link_to attributes
5abadf1
@y-yagi y-yagi correct output of auto_discovery_link_tag [ci skip] e2d9e85
Commits on Apr 04, 2015
@codeout codeout Fix a regression introduced by removing unnecessary db call when repl…
…acing

When replacing a has_many association with the same one, there is nothing to do with database but a setter method should still return the substituted value for backward compatibility.
e646d3b
@eileencodes eileencodes Don't invoke sql_runtime if logger is not set to info
`sql_runtime` was getting invoked even when the logger was set to fatal.
This ensures that does not happen by checking that the logger is set to
info level before logging the view runtime.

This reduces the number of times `sql_runtime` is called for integration
tests with a fatal logger from 6 to 2.
191facc
@aprescott aprescott Allow an array to be a default translation value.
4.2.1 introduced a change to the way `translate`/`t` works with an
option of `default: [[]]`. In 4.2.0, this would give a default value of
`[]`, but in 4.2.1, it leads to a missing translation.

`default: [[]]` is again allowed for cases where a default of `[]` is
needed.

This addresses GitHub issue 19640.
6f3c65f
@matthewd matthewd Merge pull request #19649 from aprescott/allow-array-defaults
Allow an array to be a default translation value.
07875e2
@meinac meinac change REQUEST_URI to PATH_INFO
request.env['REQUEST_URI'] returns full URI of the resource
request.env['PATH_INFO'] returns only path of the resource
75c32ed
Commits on Apr 05, 2015
@arthurnn arthurnn Merge pull request #19650 from vngrs/fix_for_i18n_documentation
change REQUEST_URI to PATH_INFO
56e0723
@senny senny Merge pull request #19644 from y-yagi/auto_discovery_link_tag_doc
correct output of auto_discovery_link_tag [ci skip]
0eab204
@robin850 robin850 Fix a few typos [ci skip] 9cc41c3
@smadeja smadeja Update command_tasks source code 1fda385
@senny senny fix typo in deprecation message. [Robin Dupret] 70b7e28
@senny senny Merge pull request #19657 from smadeja/guides-update
Update command_tasks source code
9040699
@sb8244 sb8244 head no_content when there is no template or action performed 0de4a23
@Azdaroth Azdaroth Accept lambda as child_index option in #fields_for method a813fa0
@yui-knk yui-knk [ci skip] Remove Extensions to `Proc` chapter section
`Proc#bind` is removed with 4.1 release
1917719
Commits on Apr 06, 2015
@matthewd matthewd Merge pull request #19662 from yui-knk/fix/bind
[ci skip] Remove Extensions to `Proc` section
e527688
@meinac meinac use singular table name if pluralize_table_names is setted as false w…
…hile creating foreign key

test case for use singular table name if pluralize_table_names is setted as false while creating foreign key

refactor references foreign key addition tests

use singular table name while removing foreign key

merge foreign key singular table name methods

remove unnecessary drop table from test
8c11807
@senny senny Merge pull request #19652 from vngrs/pluralize_foreign_key_table_name…
…_bug

use singular table name if pluralize_table_names is setted as false whil...
51eacc7
@dhh dhh Merge pull request #19377 from sb8244/issue-19036
when a template is missing for the default render, do head no_content instead
ca4417d
@mikej mikej fix missing "if" in API docs for ActionController::Parameters#permit e39f11f
@eileencodes eileencodes Fix method signature of `parse_query` to match rack
Recently rack was changed to have a second argument on the `parse_query`
method (in rack/rack#781). Rails relies on this and it's `parse_query`
method was complaining about missing the second argument. I changed the
arguments to `*` so we don't have this issue in the future.
0eef12c
@eileencodes eileencodes Merge pull request #19665 from eileencodes/fix-parse_query-method-sig…
…nature

Fix method signature of `parse_query` to match rack
6b98fba
@eileencodes eileencodes Fix ActionPack tests after changes to missing template logger
After merging #19377 ActionPack tests were missing a require for
`ActiveSupport::LogSubscriber::TestHelper` and change didn't take
into account that logger could be nil. Added the require and only log to
info if logger exists.

This wasn't caught earlier because these tests only run after a merge.
188934c
@meinac meinac drop_table method documentation for mysql and postgresql adapters [ci…
… skip]
1a53549
@spastorino spastorino Merge pull request #19666 from mikej/master
fix missing "if" in API docs for ActionController::Parameters#permit
2c16acd
@spastorino spastorino Merge pull request #19667 from vngrs/drop_table_doc
drop_table method documentation for mysql and postgresql adapters [ci skip]
060ee2c
@y-yagi y-yagi correct the directory which rake notes look by default [ci skip] cb04fa4
@meinac meinac change the explanation of :if_exists option [ci skip] acd21df
@kaspth kaspth Merge pull request #19670 from vngrs/misspell_of_exist
correct spell of exist [ci skip]
b69b908
@rafaelfranca rafaelfranca Merge pull request #19668 from y-yagi/notes_default_dir
correct the directory which rake notes look by default [ci skip]
4968eeb
@nishantmodak nishantmodak Fix URL rails-framework-hooks 7f178c8
@rafaelfranca rafaelfranca Merge pull request #19671 from nishantmodak/patch-1
Fix URL rails-framework-hooks
dbb7521
@rafaelfranca rafaelfranca No need to document drop_table in the PostgreSQLAdapter
It behaves in the same way that the abstract adapter.

[ci skip]
a956ec9
@KingsleyKelly KingsleyKelly [ci skip] Adds rdoc for priority explaining what the labels in the ta…
…ble means.
94b1aff
@rafaelfranca rafaelfranca Merge pull request #19448 from tgxworld/fix_activesupport_callbacks_c…
…lash_on_run

Fix AS::Callbacks raising an error when `:run` callback is defined.
c539cc0
@rafaelfranca rafaelfranca Merge pull request #19029 from iainbeeston/skipping-undefined-callbacks
Raise ArgumentError if an unrecognised callback is skipped
8b88df9
@rafaelfranca rafaelfranca Merge pull request #19647 from codeout/association_update
Fix a regression introduced by removing unnecessary db call when replacing
d5f8065
@rafaelfranca rafaelfranca Merge pull request #19661 from Azdaroth/fields-for-child-index-lambda
Accept lambda as child_index option in #fields_for method
693b333
Commits on Apr 07, 2015
@treble37 treble37 added docs for ActionDispatch::Request::Session#create 85eacc6
@treble37 treble37 remove new line between doc and method 164be37
@meinac meinac Change join model name constant to private constant
This will resolve the fixme message which is about making constant invisible.
b34c981
@jeremy jeremy Merge pull request #17574 from kamipo/charset_collation_options
Add charset and collation options support for MySQL string and text columns.
bd51bbc
@rafaelfranca rafaelfranca Merge pull request #19680 from vngrs/make_join_model_name_const_private
Change join model name constant to private constant
d69d662
@schneems schneems Merge pull request #19677 from treble37/update-docs-ActionDispatch__R…
…equest__Session.create-for-pr

added docs for ActionDispatch::Request::Session#create
44cfb2a
@rafaelfranca rafaelfranca Avoid to define an initializer after the load_config_initializers
This make the config/initializers run before the railties are loaded
what can break some configurations.
0a120a8
Commits on Apr 08, 2015
@meinac meinac fix for actionview parent layout bug
This commit fixes issue #19626
Don't need to check layout conditions if there is no condition

test for parent layout bug fix
c51aa9f
@yui-knk yui-knk [ci skip] Add `,` c1a1c58
@y00rb y00rb sort_by instead of sort
it is avoid sort errot within different and mixed keys.
used `sort_by` + `block` to list parameter by keys.
keep minimum changes
a77de09
@eagletmt eagletmt Allow AS::Cache::FileStore#clear without cache directory
Currently `Rails.cache.clear` raises Errno::ENOENT if it's run just
after cloning a new Rails project. It should succeed without removing
files or directories.
16d7cfb
Andrey Voronkov Fix uniqueness validation with out of range value 1a36be3
@sgrif sgrif Merge branch 'fix_uniqueness_validation_when_value_is_out_of_range' 67c2dee
@arthurnn arthurnn Batch touch parent records
[fixes #18606]

Make belongs_to use touch over touch_later when running the callbacks.

Add more tests and small method rename

Thanks Jeremy for the feedback.
8971389
@arthurnn arthurnn Merge pull request #19324 from arthurnn/batch_touch
Batch touch parent records
991875f
Simon Stemplinger fix documentation for SchemaStatements#add_foreign_key
The implementation of the generation of the foreign key name was changed
between Rails 4.2.0 and 4.2.1 from a random to a deterministic behavior,
however the documentation still describes the old randomized behavior.
41b2ba5
@rafaelfranca rafaelfranca Merge pull request #19698 from stemps/master
fix documentation for SchemaStatements#add_foreign_key
d7505b8
@rafaelfranca rafaelfranca Merge pull request #19694 from eagletmt/file-store-clear
Allow AS::Cache::FileStore#clear without cache directory
39c7cb2
@rafaelfranca rafaelfranca Merge pull request #19633 from y00rb/sort_router_parameters_duplicate…
…d_keys

avoid error when sort mixture keys in symbol and string
041c2c8
@rafaelfranca rafaelfranca Merge pull request #19685 from vngrs/actionview_parent_layout_bug
fix for actionview parent layout bug
a9d58c7
@rafaelfranca rafaelfranca Disable Active Job intregration tests.
They may be fixed at #19470
35a816a
@tancnle tancnle A shorter and more concise version of select..size 8d605b8
@rafaelfranca rafaelfranca Merge pull request #19700 from tancnle/trivial-shallow-nesting-depth-…
…count

A shorter and more concise version of select..size
8c8e9b3
Commits on Apr 09, 2015
@supercaracal supercaracal fix fails to force_ssl_redirection if session_store is disabled 242c5c7
@vizcay vizcay bugfix CodeStatics#calculate_directory_statics when dir has source ex…
…tension
6c5a53e
@amatsuda amatsuda redcarpet 3.2.2 has an XSS vulnerability 6c98100
@rafaelfranca rafaelfranca Merge pull request #19703 from vizcay/fix_code_statics
bugfix CodeStatics#calculate_directory_statics when dir has source ext
bbbbfe1
@rafaelfranca rafaelfranca Merge pull request #19682 from supercaracal/fix_force_ssl_redirection…
…_flash_error

Fix fails to force_ssl_redirection if session_store is disabled
d215620
@eliotsykes eliotsykes Add Active Job to Configuring Guide [ci skip] fc11ea4
@rafaelfranca rafaelfranca Merge pull request #19712 from eliotsykes/active-job-config-guide
Add Active Job to Configuring Guide [ci skip]
e8655fa
@aditya-kapoor aditya-kapoor [ci skip] remove duplicate doc for current_page? 14d1dc2
@KingsleyKelly KingsleyKelly [ci skip] Adds documentation explaining table labels for Active Job Q…
…ueueAdapters table in docs.
7d4f526
@marutosi marutosi Gemfile: temporay pin "bcrypt" version and run "bundle update bcrypt"…
… on Linux

Related: #19617, #19187, #19533, #19689, #19675.

This is POC (Proof Of Concept) which bundler does not remove mingw lines.
#19617 (comment)
7008dfb
@marutosi marutosi wrap "require 'drb/unix'" by bgin-end at test/abstract_unit.rb
Related: #19617, #19187, #19533, #19689, #19675.

'drb/unix' does not exist on mingw.
2a73b59
@marutosi marutosi [Rails4 regression] prevent thin and puma cause error in Non ASCII UR…
…L on Windows

* #19187
* #19533
* macournoyer/thin#268

These are serious Rails 4 regression for Redmine Bitnami Windows users.

https://community.bitnami.com/t/problems-with-3-0-1-installation-see-report-inside/30195/

It is not caused on webrick users.

Related:

* rack/rack#732 (comment)
* phusion/passenger#1328
7e50492
@rafaelfranca rafaelfranca Merge pull request #19689 from marutosi/master-issue-19187
[Rails4 regression] prevent thin and puma cause error in Non ASCII URL
on Windows
bfe6507
Commits on Apr 10, 2015
@yui-knk yui-knk [ci skip] Downcases filter names e9df184
@yui-knk yui-knk [ci skip] Wrap with double quotation fdcc71d
@zzak zzak Merge pull request #19716 from yui-knk/fix/filter_name
[ci skip] Downcases filter names
f0d3c92
@Mik-die Mik-die [ci skip] fix helper name 746695d
@Mik-die Mik-die [ci skip] format rake output 81b2919
@Mik-die Mik-die [ci skip] add missing file extension 8ec88a1
@sikachu sikachu Use `use_transactional_tests` in Active Record
`use_transactional_fixtures` was deprecated in favor of
`use_transactional_tests` in Rails 5.0. This removes one warning while
running test suite.
3e482f2
@guilleiguaran guilleiguaran Merge pull request #19722 from sikachu/remove-ar-use_transactional_fi…
…xtures

Use `use_transactional_tests` in Active Record
1d2cdae
@zzak zzak Merge branch 'queue-adapters-docs' of https://github.com/KingsleyKell…
…y/rails into queue-adapter-docs
c2d1bf6
@zzak zzak Copy edits for QueueAdapters docs to fix #17765 [ci skip] b0b8a6b
Commits on Apr 11, 2015
@zzak zzak Merge pull request #17512 from JackDanger/danger/use-default-view-pat…
…tern-in-docs

[docs] Using the real resolver pattern in docs
77a7c4b
@zzak zzak Merge branch 'belongs_to_primary_key_doc' of https://github.com/giris…
…hso/rails into girishso-belongs_to_primary_key_doc
47dc073
@zzak zzak Copy edits for primary_key documentation in association guide. [ci skip] d299876
@zzak zzak Merge branch 'girishso-belongs_to_primary_key_doc' 409460e
@supercaracal supercaracal fix a wrong feature test method name 3449da4
@jonatack jonatack [skip ci] primay_key -> primary_key 478a755
@kaspth kaspth Merge pull request #19728 from jonatack/patch-4
[skip ci] primay_key -> primary_key
cf57502
@eileencodes eileencodes [ci skip] Remove `link_to_function` and `button_from_function` from g…
…uides

These methods were removed in cb9f7f4 and are no longer methods in the
Rails codebase.
6ad9e2c
@eileencodes eileencodes Merge pull request #19727 from supercaracal/fix_wrong_test_method_name
fix a wrong feature test method name
24970a6
@wazery wazery Rename railties/bin to railties/exe
That will match the new Bundler executables convention.
Bundler Blog Post: http://bundler.io/blog/2015/03/20/moving-bins-to-exe.html
Also updated the necessary tests.
4521aad
@matthewd matthewd Merge pull request #19731 from wazery/rename_bin_to_exe
Rename railties/bin to railties/exe to match the new Bundler convention
cab5373
@meinac meinac Missing note on validates_presence_of validation [ci skip]
Without this note, someone can misunderstand the usage of validates_presence_of method

add missing note for the validates_presence_of
29986b0
@robin850 robin850 Merge pull request #19721 from vngrs/validates_presence_of_missing_note
Missing note on validates_presence_of validation [ci skip]
d21c688
@carlosantoniodasilva carlosantoniodasilva Remove mention of super old defined_javascript_functions method [ci s…
…kip]

It was removed long ago: e358b1f.
193297a
@schneems schneems Merge pull request #19566 from aditya-kapoor/remove-dup-doc
[ci skip] remove duplicate doc for current_page?
29d4054
@yuki24 yuki24 Speed up Levenshtein by 50% and reduce 97% of memory usage
  Calculating -------------------------------------
             each_char   924.000  i/100ms
        each_codepoint     1.381k i/100ms
  -------------------------------------------------
             each_char      9.320k (¡Þ 5.1%) i/s -     47.124k
        each_codepoint     13.857k (¡Þ 3.6%) i/s -     70.431k

  Comparison:
        each_codepoint:    13857.4 i/s
             each_char:     9319.5 i/s - 1.49x slower

The full report can be found here:
  https://gist.github.com/yuki24/a80988f35aceac76f1d5
f7ba694
@schneems schneems Merge pull request #19733 from yuki24/speed-up-levenshtein
Speed up Levenshtein by 50% and reduce 97% of memory usage
11e8b46
Commits on Apr 12, 2015
@y-yagi y-yagi remove reference to `register_javascript_expansion` and `register_sty…
…lesheet_expansion` from guide [ci skip]

These methods no longer exists.
3b88493
@senny senny Merge pull request #19734 from y-yagi/action_view_guide
remove reference to `register_javascript_expansion` and `register_stylesheet_expansion` from guide [ci skip]
5c0a618
@robin850 robin850 Fix a few typos and wrap some lines [ci skip] 5493e9c
@wazery wazery [ci skip] Update contributing guide 2e1d69e
@kaspth kaspth Merge pull request #19732 from wazery/patch-2
[ci skip] Update contributing guide
efaec3d
Dan Error message no longer tells you to set the (deprecated) secret_token. b93ae0c
@chancancode chancancode Merge pull request #19735 from Dan-Burnette/fixSecretKeyBaseErrorMessage
Error message no longer tells you to set the (deprecated) secret_token.
4825042
@nishantmodak nishantmodak view paths docs [ci skip] 6928330
@zzak zzak :scissors: 08a3baa
@zzak zzak Merge branch 'action-mailer-async-doc-fixes' of https://github.com/mf…
…azekas/rails into mfazekas-action-mailer-async-doc-fixes

Conflicts:
	actionmailer/lib/action_mailer/base.rb
1ffd603
@zzak zzak Since the delegator wasn't identified earlier, we should here [ci skip] a647277
@zzak zzak Merge branch 'mfazekas-action-mailer-async-doc-fixes' 9cabd35
@zzak zzak Merge branch 'view_paths' of https://github.com/nishantmodak/rails in…
…to nishantmodak-view_paths
66f3ec6
@zzak zzak Some copy edits for modifying View Paths [ci skip] 8b0aa0c
@zzak zzak Merge branch 'nishantmodak-view_paths' 41541b5
@ojab ojab Speedup String#squish 1a0853c
@fxn fxn Merge pull request #19738 from ojab/squish
Speedup String#squish
f39ec66
@matthewd matthewd Fix (intermittent?) test failure
We don't actually need to enumerate the possible types here any more;
that dates back to before e105e59, when
they were symbols, and indistinguishable from other options.
c7b25b8
@zzak zzak Merge pull request #19564 from jonatack/counter_cache_docs
[skip ci] Fix counter_cache in the Rails Guides
558597c
Commits on Apr 13, 2015
@wingfire wingfire Enhance documentation of pluck with a hint to ids [ci skip]
Documentation is giving an example that can be replaced by a more dry command.
Give a hint that ids can be used instead of pluck(:id).
a9f2c12
@zzak zzak Merge branch 'patch-1' 055d999
@zzak zzak Apply comments from @rafaelfranca: we shouldn't recommend you use sca…
…ffold css

Closes #19492 and fixes #19453
da5fe3b
@zzak zzak Apply edits from @senny to close #19397 [ci skip] 93d2eea
@spastorino spastorino Revert "Merge pull request #19682 from supercaracal/fix_force_ssl_red…
…irection_flash_error"

This reverts commit d215620, reversing
changes made to bbbbfe1.
e085a7d
@zzak zzak Add note wrt foreign key constraint to ensure data integrity
Thanks for patch @sgrif :trollface:

Closes #18216
f1af967
@zzak zzak Merge branch 'master' of github.com:rails/rails dc70f71
@zzak zzak Add a note regarding add_column restricted API [ci skip]
We should document current behavior, and this is design of API for now.

Closes #17597
e83c398
@donbobka donbobka update request_forgery_protection docs [ci skip] fd0f27c
@zzak zzak Apply comments from @jeremy regarding why HTML and Javascript requests
specifically are checked for CSRF, when dealing with the browser.

[ci skip]
e1ebf14
@zzak zzak Add note regarding CSRF for APIs, as a use-case for skipping it [ci s…
…kip]
2778ba8
@zzak zzak Merge branch 'feature/doc_request_forgery_protection_for_api' 86ba051
@greysteil greysteil Document that partial indexes are only supported by Postgres and SQLite.
Fixes #18106
e91c433
@senny senny Merge pull request #19741 from greysteil/add-note-about-partial-index…
…-support

Document that partial indexes are only supported by Postgres and SQLite.
ec59d6e
@meinac meinac Fix the wrong documentation about config.autoload_paths [ci skip]
config.autoload_paths is not changeable from environment specific configuration files.
45747a5
@carlosantoniodasilva carlosantoniodasilva Improve note about unique index and foreign key on has_one association
Related to f1af967. [ci skip]
f54e89b
@carlosantoniodasilva carlosantoniodasilva Merge pull request #19742 from vngrs/config_autoload_paths_wrong_doc
Fix the wrong documentation about config.autoload_paths [ci skip]
ea97c76
Commits on Apr 14, 2015
@y-yagi y-yagi fix indent in routes when using namespaced controllers
Before:

  namespace :foo do
  namespace :bar do
    get 'baz/index'
    end
  end

After:

  namespace :foo do
    namespace :bar do
      get 'baz/index'
    end
  end
d2be2a9
@vijaydev vijaydev Merge branch 'master' of github.com:rails/docrails 8ac458a
@jonatack jonatack Upgrade to Ruby 2.2.2
and fix the grammar in the ruby_version_check.rb user message.
32f7491
@yuki24 yuki24 Add support for Set to Relation#where
Previously `#where` used to treat `Set`objects as nil, but now it treats
them as an array:

  set = Set.new([1, 2])
  Author.where(:id => set)
  # => SELECT "authors".* FROM "authors" WHERE "authors"."id" IN (1, 2)
50cae60
@yuki24 yuki24 Use Ruby 2.2.2 on travis
This is required to run #19752 successfully.
1e2fcbb
@kmcphillips kmcphillips Override default form builder for a controller 2b8acdc
@guilleiguaran guilleiguaran Merge pull request #19753 from jonatack/use-ruby-2-2-2
Upgrade to Ruby 2.2.2
33ea933
@guilleiguaran guilleiguaran Merge pull request #19754 from yuki24/ruby-2.2.2-on-travis
Use Ruby 2.2.2 on travis
34d3a60
@senny senny Merge pull request #19755 from yuki24/activerecord/support-for-set
Add support for Set to Relation#where
524d405
@pixeltrix pixeltrix Merge pull request #19751 from y-yagi/fix_indent_of_controller
fix indent in routes when using namespaced controllers
4fb3a55
@eileencodes eileencodes Use `silence_warnings` on `StaticTests`
When 7e50492 was merged setting `Encoding.default_internal` and
`Encoding.default_external` would throw a warning when the ActionPack
tests were run.

Example warning: `actionpack/test/dispatch/static_test.rb:12: warning:
setting Encoding.default_external`

This patch silences the warnings as other similar tests do for setting
default_internal and default_external.
db8897c
@Strech Strech Tiny optimization of http auth Realm unquoting 53dedfc
@rafaelfranca rafaelfranca Merge pull request #19736 from kmcphillips/master
Set default form builder for a controller
9ec54d9
@rafaelfranca rafaelfranca Fix typos in the documentation [ci skip] b4a9c59
@andreynering andreynering Removing GZip section since Sprockets 3.0 no longer create .gz files … f1c2937
@rafaelfranca rafaelfranca Merge pull request #19758 from andreynering/remove-gzip-doc
Removing GZip section since Sprockets 3.0 no longer create .gz files
4c665b8
@troter troter avoid double initialization error caused to sidekiq
Sidekiq::CLI#boot_system require "#{dummy_app_path}/config/environment.rb".
But this file has already been required in'test/support/integration/helper.rb'.
This patch will change to use Sidekiq::Launcher directly.
b126e7a
@rafaelfranca rafaelfranca Enable Active Job integration tests again 413398f
@yuki24 yuki24 Use #prepend rather than using 2 aliases d3684c4
@carlosantoniodasilva carlosantoniodasilva Merge pull request #19752 from yuki24/use-prepend-rather-than-alias
Use #prepend rather than using 2 aliases
fcd8e62
@arthurnn arthurnn Merge pull request #19757 from Strech/http-auth-realm-unquoting
Tiny optimization of http auth Realm unquoting
7d4a1ab
@zzak zzak Merge pull request #19446 from andersonDadario/fix_security_guide_cap…
…tcha_03_21_2015

Fix security guide captcha 03 21 2015 [ci skip]
163de75
Commits on Apr 15, 2015
@senny senny Revert "Merge pull request #19755 from yuki24/activerecord/support-fo…
…r-set"

This reverts commit 524d405, reversing
changes made to 34d3a60.

Reasoning behind the revert are in the PR discussion:
#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.
5f00ed1
@jonatack jonatack Fix typos and improve the documentation
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.
6345f31
@senny senny Merge pull request #19763 from jonatack/fix-typos-in-docs
Fix typos and improve the documentation
c0939a5
@y-yagi y-yagi remove extra `=` in form builder example [ci skip] 653246f
@kaspth kaspth Merge pull request #19765 from y-yagi/fix_typo_in_form_builder
remove extra `=` in form builder example [ci skip]
810c3cf
@blasterpal blasterpal Correct small typo.
  * files are written to hard "disk" not "disc".
62a5d8a
@rafaelfranca rafaelfranca Merge pull request #19766 from blasterpal/small_typo_in_asset_pipeline
Correct small typo.
75f1415
@davydovanton davydovanton [Skip ci] Add information about :host options
Added informations about :host options for each url helper
(#javascript_url, #video_url, #stylesheet_url, etc) based on #asser_url
method.
a4d589e
@seuros seuros Merge pull request #19774 from davydovanton/doc-update-asser-url
[Skip ci] Add information about :host options
8d11151
@meinac meinac fix typo asser url [ci skip] b0e17b9
@seuros seuros Merge pull request #19775 from vngrs/fix_typo_asser_url
fix typo asser url [ci skip]
5256ada
Commits on Apr 16, 2015
@thenickcox thenickcox [ci skip] Document running a rake command as a rails command 7937c6a
@schneems schneems Merge pull request #19778 from thenickcox/commands_docs
[ci skip] Document running a rake command as a rails command
e263923
@10io 10io add active job testing section [ci skip] e87ad3c
@seuros seuros Merge pull request #19780 from 10io/active_job_testing
add active job testing section [ci skip]
c8bab30
@Senjai Senjai Encourage users to user super to override methods.
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.
8f7d9eb
Commits on Apr 17, 2015
@yui-knk yui-knk [ci skip] Update code example of Enumerable#without 4563062
@seuros seuros Merge pull request #19795 from yui-knk/fix/without_guide
[ci skip] Update code example of Enumerable#without
f7a61c2
@yui-knk yui-knk [ci skip] Replace `list` with `array` 581906d
@seuros seuros Merge pull request #19800 from yui-knk/fix/wrap_doc3
[ci skip] Replace `list` with `array`
1881a77
@sikachu sikachu Add missing require for String#strip_heredoc
This method is being used in `#xml_http_request`, but was not properly
required. This causes `NoMethodError` on projects that are doing
integration test.
3a20e83
@rafaelfranca rafaelfranca Merge pull request #19802 from sikachu/add-missing-require
Add missing require for String#strip_heredoc
8cf73b9
Commits on Apr 18, 2015
@vircung vircung Improve documentation [ci skip]
Add information about usage `uuid` type with `reference`
db8b060
@senny senny Merge pull request #19806 from vircung/master
Improve documentation for uuid [ci skip]
154e13c
@senny senny Merge pull request #19787 from Senjai/patch-2
[Doc] Encourage users to user super to override methods.

[ci skip]
228559e
@sgrif sgrif Autosave existing records on HMT associations when the parent is new
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
d849f42
Commits on Apr 19, 2015
@prathamesh-sonpatki prathamesh-sonpatki Spell out "asynchronously" instead of async in guides [ci skip] 47fbde4
@piton4eg piton4eg Update association_basics.md
01ea8c2
@robin850 robin850 Merge pull request #19811 from prathamesh-sonpatki/fix-aj-guide
 Spell out "asynchronously" instead of async in guides [ci skip]
5cab1fb
@y-yagi y-yagi add missing require for ArrayInquirer 33653c8
@robin850 robin850 Merge pull request #19812 from piton4eg/patch-1
Update association_basics.md [ci skip]
0ff8759
@yui-knk yui-knk [ci skip] Fix docs and guide about 'Array.wrap' c94577d
@arthurnn arthurnn Merge pull request #19799 from yui-knk/fix/wrap_doc2
[ci skip] Fix docs and guide about 'Array.wrap'
4e141f1
@rafaelfranca rafaelfranca Merge pull request #19814 from y-yagi/array_inquiry
add missing require for ArrayInquirer
8f3584a
@tpitale tpitale Update 4_2_release_notes.md b26fafc
@meinac meinac 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
5e8d96c
@sgrif sgrif Merge pull request #19783 from vngrs/raise_error_on_touch_if_object_i…
…s_stale

Raise StaleObjectError if touched object is stale and locking is enabled
9721b45
@rafaelfranca rafaelfranca 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.
b584cc6
@rafaelfranca rafaelfranca Merge pull request #19817 from tpitale/4_2-release-notes-fix
Binding to localhost only allows access to localhost
00aa1af
@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