Skip to content
This repository
  • 10,000 commits
  • 309 files changed
  • 61 comments
  • 65 contributors
This comparison is big! We're only showing the most recent 250 commits
Feb 04, 2014
Greg Molnar gregmolnar add missing sharp [ci skip] d3edf1e
Arun Agrawal arunagw Merge pull request #13940 from gregmolnar/guides
add missing sharp [ci skip]
75510a6
Rafael Mendonça França rafaelfranca Merge pull request #13935 from arthurnn/fix_12566
Make sure transaction state resets after commit
f1a6307
Rafael Mendonça França rafaelfranca Add CHANGELOG entry for #13935 [ci skip] 404cb36
Logan Hasson loganhasson [ci skip] Add missing 'task' to note on Running Migrations e9bfa28
Rafael Mendonça França rafaelfranca Merge pull request #13943 from loganhasson/master
[ci skip] Add missing 'task' to note on Running Migrations
9079432
Rafael Mendonça França rafaelfranca Document that enum conditions must use the ordinal value
[ci skip]
f92142d
Feb 05, 2014
Yves Senn senny docs, AR already auto-detects primary keys. Closes #13946. [ci skip]
This behavior was introduced since Rails 3.1 (207f266)
but the docs were still out of date.
3ba0eed
Vajrasky Kok vajrasky Fixed typo in column_definition_test.rb. 3877794
Yves Senn senny Merge pull request #13949 from vajrasky/fix_typo_column_definition_test
Fixed typos in column_definition_test.rb.
132834b
Calvin Tam calvintam Fixed typos [ci skip] 128fa3b
Arun Agrawal arunagw Merge pull request #13950 from calvintam/fix_typos
Fixed typos
069a010
Arun Agrawal arunagw Removed unused commented code [ci skip]
As discussed in #13940 this can be removed
We can document this somewhere else in testing guides.
10867a7
Yves Senn senny remove gemnasium batch from README. [ci skip]
The rails/rails gemnasium page (https://gemnasium.com/rails/rails) is not helping much.
It lists 0 dependencies so there is not much to track. Also our gems mostly depend
on other gems we control. There is not much point in monitoring them.

The batch was introduced with #3909.
1df4dcf
Marc-André Lafortune marcandre Remove obsolete line (was needed for Ruby 1.8.7 support) 4c3e11d
Marc-André Lafortune marcandre Remove obsolete test (builtin group_by is now used) 39b2cc1
Marc-André Lafortune marcandre Strengthen test with different nb of rows and columns 4499ab5
Marc-André Lafortune marcandre Return sized enumerator from Batches#find_in_batches d37f395
Marc-André Lafortune marcandre Return sized enumerator from Batches#find_each 13d2696
Marc-André Lafortune marcandre Return sized enumerator from Enumerable#index_by a476020
Rafael Mendonça França rafaelfranca Merge pull request #13938 from marcandre/sized_enumerator
Sized enumerator
84fe7b7
Sean Walbran seanwalbran fix interplay of humanize and html_escape 26698fb
Rafael Mendonça França rafaelfranca Merge pull request #13953 from seanwalbran/fix-humanize-match-reference
fix interplay of humanize and html_escape
6cc3afb
Petru Hincu hpetru Fixed "Hash#to_param confused by empty hash values #13892" 326e652
Rafael Mendonça França rafaelfranca Move test to the right file 88b064d
Rafael Mendonça França rafaelfranca Test with a blank value d6e3fd7
Rafael Mendonça França rafaelfranca Refatoring the method to avoid shot-circuit return ab51b28
Rafael Mendonça França rafaelfranca Add CHANGELOG entry
Closes #13909
7aa4b7d
Feb 06, 2014
Rafael Mendonça França rafaelfranca Fix to_query with empty arrays too c82dbc6
Dev Mehta dpmehta02 update contribution doc grammar. [ci skip]
- Manually applied from #13951.
- Discussion at #13947.
- Removed trailing whitespace from dpmehta02@18044e8

/cc @dpmehta02
b9ead0f
Yves Senn senny synchronize 4.1 release notes with CHANGELOGS. [ci skip] 580f0b6
Yves Senn senny docs, Associations also raise on name conflicts. [ci skip] 7f648bc
Emil Soman emilsoman Add config to disable schema dump after migration
* Add a config on Active Record named `dump_schema_after_migration`
* Schema dump doesn't happen if the config is set to false
* Set default value of the config to true
* Set config in generated production environment file to false
* Update configuration guide
* Update CHANGELOG
8806768
Xavier Noria fxn Merge branch 'dump-schema-after-migration-flag' of git://github.com/e…
…milsoman/rails into emilsoman-dump-schema-after-migration-flag

Conflicts:
	activerecord/CHANGELOG.md
c0fb8d0
Ionatan Wiznia Tests that skips a controller filters that was set up using a class f8d740a
Feb 07, 2014
Yves Senn senny Merge pull request #13962 from iwiznia/test_controller_skip_action_class
Test for skipping a controller filter set up with a class Part 3
e3d8194
Calvin Tam calvintam Fixed spelling error: `extracetd` => `extracted` 2fdbd59
Matthew Bradley kintamanimatt Fix wordy sentence bb87c16
Yves Senn senny Merge pull request #13968 from kintamanimatt/fix-wordy-sentence
Fix wordy sentence [ci-skip]
2248684
Philipe Fatio fphilipe Require action_view to fix missing constant
Previously, requiring action_view/view_paths did cause an uninitialized
constant error for ENCODING_FLAG, which is defined in action_view.
47860b6
प्रथमेश prathamesh-sonpatki [Testing Guide] Mention :unauthorized in assert_response explanation …
…[ci skip]
8fffcfc
Yves Senn senny Merge pull request #13967 from fphilipe/fix-missing-action-view-const
Require action_view to fix missing constant ENCODING_FLAG
9da2ae1
Yves Senn senny Merge pull request #13952 from prathamesh-sonpatki/testing
[Testing Guide] Mention :unauthorized in assert_response explanation [ci skip]
ed66361
Andrew White pixeltrix Adjust test value so that timezone has no effect
If the test is run in a timezone that is behind UTC it fails because
the time generated is ahead of 0000-01-01 00:00:00. Just increase the
time subtracted so that timezone has no effect.
3f90787
Feb 08, 2014
Yves Senn senny docs, Cookie values are String based. Closes #12860. [ci skip] 519deb6
Robin Dupret robin850 Rely on backticks instead of tt tags [ci skip]
Since the language in code blocks is inferred, if the code contains tt
tags, the block will be parsed as XML for instance while it is Ruby.
50d828c
Kevin Casey Fortisque context in validation goes through has many relationship 5e3d466
Godfrey Chan chancancode Updated the cookie docs to use the safer JSON.{generate,parse} 7757714
Lauro Caetano laurocaetano Add test case for autosave HasMany with accepts_nested_attributes.
It should not save the parent record when the nested attributes are
invalid.

Test case to cover #8194.
1ea61cb
Rafael Mendonça França rafaelfranca Merge pull request #13974 from laurocaetano/test_case_for_autosave_wi…
…th_accepts_nested_attributes

Add test case for autosave association with nested attributes.
3c2fe5c
Noah Octember Fixed an issue where reloading of removed dependencies would cause an…
… unexpected circular dependency error
4fa8c8b
Aaron Patterson tenderlove Merge pull request #13977 from Octember/master
Fixed an issue where reloading of removed dependencies would cause an un...
3c8e0a4
Aaron Patterson tenderlove Merge pull request #13979 from mellowi/windows_disallowed_static_file…
…s_skipped

Skips tests on Windows that create files with illegal characters
1ec25d1
Aaron Patterson tenderlove Merge pull request #13980 from mellowi/skipping_linked_folder_tests_i…
…f_symlink_is_invalid

Skips linked folder tests if symlink is invalid
3b684dd
Aaron Patterson tenderlove Merge pull request #13978 from Fortisque/kevin/validation_context_for…
…_children

context in validation goes through has many relationship
f99b254
Kevin Casey Fortisque Reaper has access to threadsafe active? call 02a3c0e
Myron Marston myronmarston Add missing test for response destructuring. cbd10e2
Aaron Patterson tenderlove Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_thre…
…adsafe

Reaper has access to threadsafe active? call
e4dc303
Aaron Patterson tenderlove use feature detection to decide which implementation to use
Decouple the code from the particular Ruby version.
76af5c1
Dan Kang dskang Prevent [response].flatten from recursing infinitely.
Returning `self` from within the array returned by `to_ary`
caused this. Instead, we can just substitute another object.
It provides the `each` behavior required by the rack spec.
069bc27
Feb 09, 2014
Mikko Johansson mellowi Skips tests on Windows that create files with illegal characters ccd1c43
Mikko Johansson mellowi Skips linked folder tests if symlink is invalid 28a450d
Zachary Scott zzak Remove outdated TODO from url_for test, this test was fixed in 900a2d3 dfe9cf1
SHIBATA Hiroshi hsbt use File.exist? instead of File.exists? a09c078
Godfrey Chan chancancode Merge pull request #13983 from hsbt/remove-warning
use File.exist? instead of File.exists?
6ac2655
Zachary Scott zzak FilterParameters is referenced at the class level from the Request
Since it's already required in the file, we don't need to use autoload
too. This commit is symmetrical change to 0b10180 for Response.
8d7923b
Zachary Scott zzak Fix grammar of internal comment and modify it's location dbe3345
Zachary Scott zzak Specify what #starts_with? we're talking about. Also added a note what
kind of exception we should expect for this internal comment.
17b0edd
Yves Senn senny docs, link MySQL manual for multi column indexes. [ci ckip].
Closes #9131.
4e4a92e
Zachary Scott zzak Use full-length version of multiple from c7abc51 605c81b
Xavier Noria fxn adds a section about booleans in the API guidelines [ci skip] 7afd92e
Zachary Scott zzak Fixed a grammatical error in Booleans section of API documentation guide
from e1e17a5
ae7580a
Dmitry Polushkin dmitry move alias method `sanitize_conditions` to a correct place 424b2d8
Dmitry Polushkin dmitry add activerecord test coverage for `sanitize_sql_array`
check it is handles empty statement
ec43584
Zachary Scott zzak Remove end of line whitespace from bb87c16 a503444
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #13985 from zzak/remove_old_todo_in_url_for_test
Remove outdated TODO from url_for test, this test was fixed in 900a2d3
e08514e
Rafael Mendonça França rafaelfranca Merge pull request #13990 from zzak/ap_dont_autoload_filter_parameters
FilterParameters is referenced at the class level from the Request
a5ee843
Aaron Patterson tenderlove Merge pull request #13982 from dskang/fix-response-flatten-infinite-r…
…ecursion

Fix response flatten infinite recursion
33be58b
Jed Hartman Clarifying confusing phrasing f25e411
Vijay Dev vijaydev Merge branch 'master' of github.com:rails/docrails
Conflicts:
	guides/source/active_record_validations.md
	guides/source/api_documentation_guidelines.md
	guides/source/configuring.md
92fdd65
Vijay Dev vijaydev Merge pull request #13994 from elysdir/master
Clarifying confusing phrasing
8b5d08a
Vijay Dev vijaydev Merge pull request #13630 from seapy/master
Fixed typo [ci skip]
ccd908f
Vijay Dev vijaydev Simplify doc [ci skip]
The `as` option was already explained in a previous example
and doesn't need to be repeated. Explain only the `locals` option
which the example is meant for.
72e11ab
Dmitry Polushkin dmitry add actionmailer test coverage for undefined delivery method 5af7cab
Dmitry Polushkin dmitry add test coverage for activemodel Dirty#reset_changes 8acd58f
Andrew White pixeltrix Set the :shallow_path as each scope is generated
If we set :shallow_path when shallow is called it can result in incorrect
paths if the resource is inside a namespace because namespace itself sets
the :shallow_path option to the namespace path.

We fix this by removing the :shallow_path option from shallow as that should
only be turning shallow routes on and not otherwise affecting the scope.
To do this we need to treat the :shallow option to resources differently to
other scope options and move it to before the nested block is called.

This change also has the positive side effect of making the behavior of the
:shallow option consistent with the shallow method.

Fixes #12498.
462d7cb
Rafael Mendonça França rafaelfranca Merge pull request #13997 from dmitry/test_coverage_improvement
Test coverage improvement
e4911e9
Ben Cullen-Kerney bak A pass over the Getting Started guide sections 1, 2, and 3 [ci skip]
* Add note about managing Ruby environments
* Point to curated lists of Ruby learning resources
* Expound on DRY and Convention over Configuration
* Remove note on superuser--thankfuly coders new to Rails don't have to sudo anymore :)
* Installation/verification instructions for SQLite3, since it's a dependency
2868bab
Robin Dupret robin850 Merge pull request #13998 from gaurish/doc-rails-threadsafe
`Rails.threadsafe!` mode is deprecated, Update Docs [ci skip]
3a428f3
Feb 10, 2014
Gaurish Sharma gaurish `Rails.threadsafe!` mode is deprecated
[ci skip]
395bcb5
Yves Senn senny docs, mention that the current inflection rules are frozen. [ci skip]
Closes #13993.
07c7024
Justin Coyne jcoyne Fix tidy_bytes for JRuby
The previous implementation was broken because JRuby (1.7.10) doesn't
have a code converter for UTF-8 to UTF8-MAC.
ae28e4b
Yves Senn senny docs, update broken link. [ci skip] 56fa194
Yves Senn senny docs, link to HTTP and CGI header definitions. [ci skip]
This was a reaction to: #9700 (comment)
3b868cc
Rafael Mendonça França rafaelfranca Merge pull request #13919 from jcoyne/fix_jruby_encoding
Fix tidy_bytes for JRuby
e063dbc
Rafael Mendonça França rafaelfranca Avoid using deprecated arel constants 73a431a
Matthew Bradley kintamanimatt Add missing directory slashes [ci skip] 67e6dee
Rafael Mendonça França rafaelfranca Merge pull request #14007 from kintamanimatt/missing_directory_slashes
Add missing directory slashes [ci skip]
488885a
Zachary Scott zzak Add tip about using RDoc's --pipe command to quickly test the output of
a piece of documentation.

This can be useful for trying out combinations of markup and code, as
discussed in rails/rails@225bcad
5c3eda8
Feb 11, 2014
Yves Senn senny docs, hide inflector comment targeting only contributors. [ci skip]
This is a follow up to: 07c7024

As suggested by @fxn this comment should not be visible in the API:
07c7024#commitcomment-5331658
92f567a
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14008 from udaykadaboina/jqueryUpgrade
Upgraded jquery-rails gem version
f0d8996
Godfrey Chan chancancode Renamed session_serializer option to cookies_serializer b927d67
Godfrey Chan chancancode Just very so slightly better test coverage 54641fa
Godfrey Chan chancancode Added HybridSerializer to upgrade existing marshal cookies (wip: need…
… tests)
fafe8ec
Godfrey Chan chancancode Removed an old test 25f68ac
Rafael Mendonça França rafaelfranca Tests for the HybridSerializer d4b7aa7
Godfrey Chan chancancode Fixed minor typo in test code 6de4888
Godfrey Chan chancancode Changed the tests to ensure HybridSerializer actually migrates the co…
…okies (currently failing)
ba6861d
Guillermo Iguaran guilleiguaran Convert FlashHash in a Hash with indifferent access a6ce984
Guillermo Iguaran guilleiguaran Stringify the incoming hash in FlashHash
Stringify the incoming as well to handle incoming symbol keys from
marshalled sessions
a668bef
Godfrey Chan chancancode Re-write legacy (marshal) cookies on read ead947a
Guillermo Iguaran guilleiguaran Remove serializer option from session_store.rb template 3a89386
Guillermo Iguaran guilleiguaran Fix AppGeneratorTest: serializer option was removed from session_store cd5960e
Godfrey Chan chancancode Fixed broken flash tests b97e087
Godfrey Chan chancancode Missed FlashHash#replace 9fc7a6f
Godfrey Chan chancancode Added changelog entry for Flash changes [ci skip] ecf04f1
Godfrey Chan chancancode Updated CHANGELOG, docs, guides and release notes.
Also added a `cookies_serializer.rb` initializer to the app template.
0b86a6e
Godfrey Chan chancancode Migrate hash-based cookie values correctly 7a3ef98
Godfrey Chan chancancode rm warning about variable shadowing dafc0ee
Vijay Dev vijaydev Merge pull request #13571 from bak/getting_started_guide
A pass over the Getting Started guide sections 1, 2, and 3 [ci skip]
888386a
Yves Senn senny test case to illustrate current PostgreSQL composite behavior. 4b11dcc
Angelo Capilleri acapilleri add patch in HTTP Verb Constraints [ci skip] 3a0cc5c
Guillermo Iguaran guilleiguaran Merge pull request #14015 from acapilleri/add_patch
add patch in HTTP Verb Constraints [ci skip]
b12c1b8
devlinzed Don't symbolize tainted data.
`I18n.locale=` symbolizes its argument, so passing it `params[:locale]`
allows one to DOS your application by visiting `...?locale=` URLS
repeatedly, with unique values, until the never-GCed symbols monopolize
the available memory.
ec0664a
Xavier Noria fxn Merge pull request #14016 from devlinzed/i18n_doc_fix
Documentation: Don't symbolize tainted data. [ci skip]
4359bc6
Xavier Noria fxn Revert "Don't symbolize tainted data." [ci skip]
Reason: i18n whitelists now locales without passing through symbols,
see https://github.com/svenfuchs/i18n/blob/master/lib/i18n.rb#L278.
Therefore, this snippet is no longer a good practice.

This reverts commit ec0664a.
e00ab2d
Aaron Patterson tenderlove add a send so `apply` can be called. Fixes #13510
THIS IS A HUGE HACK.  Thor does not allow us to define public methods
without turning them in to "thor tasks".  That means we cannot subclass
the `apply` method and make it public, so we have to make the method
private and call `send` on it.
c5034d6
Kayvan kayvannj adding connection parameter to check_pending for migrations 2862cd8
Kayvan kayvannj adding missed change f34e0c4
Christian Wesselhoeft xtian Hide bundler output for `rails new` if quiet option is specified. 2c7471a
Feb 12, 2014
प्रथमेश prathamesh-sonpatki [Testing Guide] Explain usage of assert_redirected_to with named rout…
…es and Active Record objects [ci skip]
42b2e32
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14023 from prathamesh-sonpatki/assert_redirected_to
[Testing Guide] Explain usage of assert_redirected_to with named routes and ActiveRecord objects [ci skip]
6d14c22
Erik Michaels-Ober sferik Update Travis settings for Rubinius af66c46
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14026 from sferik/rbx-2
Update Travis settings for Rubinius
7d5454d
Yves Senn senny Merge pull request #14025 from xtian/rails-new-quiet
Hide bundler output for `rails new` if quiet option is specified.
8cdd93a
Yves Senn senny do not crash when `config/secrets.yml` is blank. 37e30d2
Iain Beeston iainbeeston Added tests to render helper that expect `render partial: @foo` to
automatically call @foo.to_partial_path

Calling `render @foo` allows local variables but not options to be
passed to the partial renderer. The correct way to render an object AND
pass options to the partial renderer is to pass the object in the
`:partial` parameter. However, there were previously no tests for this
behaviour (in `render_helper_test.rb` at least).
5b793a8
Rafael Mendonça França rafaelfranca Merge pull request #13761 from iainbeeston/refactor_out_render_object
Refactored object rendering in RenderingHelper#render into it's own method
4dc4204
Aaron Patterson tenderlove `execute` is a hotspot, so let's reduce branches 4bf7071
Matthew Draper matthewd Terminate the backend ourselves on PG 9.2+
This should make it harder to accidentally break this test.
3b645fd
Aaron Patterson tenderlove Merge pull request #14035 from matthewd/pg_terminate_backend
Terminate the backend ourselves on PG 9.2+
6e61da2
Feb 13, 2014
David Fernandez 10io Fix coffeescript sample [ci skip]
Replace bind() with on() as suggested by the JQuery bind() documentation: https://api.jquery.com/bind/
d0b251e
Guillermo Iguaran guilleiguaran Merge pull request #14029 from senny/dont_crash_on_empty_secrets_yml
do not crash when `config/secrets.yml` is blank.
6a1b459
Guillermo Iguaran guilleiguaran Merge pull request #13945 from rails/json_cookie_serializer_improvements
Cookies serializer improvements
de5ef15
Łukasz Strzałkowski strzalek Variant negotiation
Allow setting `request.variant` as an array - an order in which they will be
rendered.

For example:

  request.variant = [:tablet, :phone]

  respond_to do |format|
    format.html.none
    format.html.phone # this gets rendered
  end
f9b6b86
Arthur Nogueira Neves arthurnn Dont use Enumarator on join_association c387252
Yves Senn senny tests are responsible to clean up afterwards.
remove created state after test execution, not before the next test.
This prevents the leak of the `ex` table outside of a single test.
ea3af7e
Hubert Dąbrowski hdabrows Drop the correct index after reverting a migration
Previously when reverting a migration which added a named index it
would instead drop a corresponding index with matching columns but
without a name.
e1d4673
David Heinemeier Hansson dhh Merge pull request #14043 from strzalek/variants-negotiation
Variant negotiation
f2dfa83
Łukasz Strzałkowski strzalek Check if variant array contains only symbols 00a4af9
Guillermo Iguaran guilleiguaran Merge pull request #14045 from arthurnn/kill_fibers
Dont use Enumarator on join_association
24fc74c
Yves Senn senny Merge pull request #14034 from hdabrows/drop-correct-index-when-rever…
…ting-migration

Drop the correct index after reverting a migration
ad48267
David Heinemeier Hansson dhh Merge pull request #14047 from strzalek/variants-array-check
Check if variant array contains only symbols
9ec42f9
Aaron Patterson tenderlove speed up the collection proxy reader method, but slow down the constr…
…uctor
f9e4c3c
Philippe Creux pcreux Add hint to error message of task db:migrate:down b283190
David Heinemeier Hansson dhh No variant should also be picked up by variant.any if variant.none is…
… not defined (just like any other variant)
bfc34fc
Aaron Patterson tenderlove JoinHelper is never reused, so there is no need to separate 0fddc3c
Aaron Patterson tenderlove rm delegate methods that are not actually used 500b1df
Aaron Patterson tenderlove :scissors: whitespace e804d07
Aaron Patterson tenderlove remove more delegate methods 7d897ab
Feb 14, 2014
Karthik T ktaragorn Getting started guide fixes & Explain X-SendFile a little better, wit…
…h links

Explain how form_for :article is able to pull in the properties of @article
Make it clear that article_id is generated due to the association set up

Add link to the rails function that uses X-Sendfile.
Add links to apache and nginx docs for the header
8e6d0fd
Rajarshi Das rajcybage remove unused fixtures from sqlite3 test cases 680f7d9
tbpgr tbpgr fix guide active_support_core_extensions. add Note to String#indent […
…ci skip]
0e19e35
Leo Antoli lantoli updated Travis build status image url 4f5aff9
Rafael Mendonça França rafaelfranca Merge pull request #14058 from lantoli/master
updated Travis build status image url
bcaef36
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14059 from tbpgr/guides_active_support_core_ext
[Guides] fix guide active_support_core_extensions. add Note to String#indent [ci skip]
926781b
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14057 from rajcybage/Ar_remove_unnecessary_fixtures
Remove unused fixtures from sqlite3 test case
112b58f
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14048 from pcreux/better-error-message-db-migrate…
…-down

Add hint to error message of task db:migrate:down
cdda290
Kassio Borges kassio fix path shown in mailer's templates aae455f
Rafael Mendonça França rafaelfranca Merge pull request #14060 from kassio/master
Fix path shown in mailer's templates
820f635
Dave Jachimiak davejachimiak Add verb to sanitization note 848e377
Rafael Mendonça França rafaelfranca Merge pull request #14061 from davejachimiak/add_verb_in_guides
Add verb to sanitization note
8ce72d9
Aaron Patterson tenderlove remove scope_chain delegate 279212d
Aaron Patterson tenderlove remove chain delegate a8775bb
Aaron Patterson tenderlove remove railties changes. fixes #14054
Squashed commit of the following:

commit 96991e8
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri Feb 14 11:29:24 2014 -0800

    Revert "gems can be added or skipped from the template"

    This reverts commit 8beb42c.

    Conflicts:
    	railties/lib/rails/generators/rails/app/app_generator.rb
    	railties/test/generators/app_generator_test.rb

commit 35599c0
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri Feb 14 11:26:53 2014 -0800

    Revert "oops, template replay needs to happen after bundle. :orz:"

    This reverts commit 9104702.

    Conflicts:
    	railties/lib/rails/generators/rails/app/app_generator.rb

commit f519c39
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri Feb 14 11:25:51 2014 -0800

    Revert "only ask for these ivars if the target responds to them"

    This reverts commit 656d412.

commit aa524a9
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri Feb 14 11:25:39 2014 -0800

    Revert "refactor generator tests to use block form of Tempfile"

    This reverts commit 6525182.

commit 7d37405
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri Feb 14 11:25:25 2014 -0800

    Revert "add a more restricted codepath for templates fixes #13390"

    This reverts commit 2875b4a.

commit 525df0af1001918986cdfce59539fd2d52c4f32c
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri Feb 14 11:25:11 2014 -0800

    Revert "add a send so `apply` can be called.  Fixes #13510"

    This reverts commit c5034d60dba0cd31a6a8c612ee35d63b8127793a.
22a1a5a
Aaron Patterson tenderlove remove klass delegator 40a015f
Aaron Patterson tenderlove remove the reflection delegate a35325e
Aaron Patterson tenderlove clean up add_constraints signature db3f50c
Aaron Patterson tenderlove pass the tracker down the stack and construct it in the scope method 3b675f0
Aaron Patterson tenderlove pass the association and connection to the scope method 8e6ef92
Aaron Patterson tenderlove make a singleton for AssociationScope
AssociationScope no longer maintains state, so we're safe to keep a
singleton and save on GC time
213b2fb
Aaron Patterson tenderlove make most parameters to the AliasTracker required
This helps with our sanity.  The class is internal, we can refactor to a
"nice" API later.
c24ea24
Aaron Patterson tenderlove stop exposing table_joins 494a26d
Aaron Patterson tenderlove guarantee a list in the alias tracker so we can remove a conditional 4e823b6
Aaron Patterson tenderlove add factory methods for empty alias trackers
If we know the alias tracker is empty, we can create one that doesn't
use a hash with default block for counting.

ActiveRecord::Base.establish_connection(adapter: 'sqlite3',
                                        database: ':memory:')

ActiveRecord::Schema.define do
  create_table :posts, force: true do |t|
    t.integer :comments_count
  end

  create_table :comments, force: true do |t|
    t.integer :post_id
  end
end

class Post < ActiveRecord::Base; has_many :comments; end
class Comment < ActiveRecord::Base; belongs_to :post, counter_cache: true; end
10.times { Comment.create!(post: Post.create!) }

record = Post.first
association_name = :comments

Benchmark.ips do |x|
  reflection = record.class.reflect_on_association(association_name)
  association = reflection.association_class.new(record, reflection)
  x.report('assoc') do
    reflection.association_class.new(record, reflection)
  end
  x.report('reader') do
    association.reader;nil
  end
  x.report('combined') do
    reflection.association_class.new(record, reflection).reader;nil
  end
end

[aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb
-- create_table(:posts, {:force=>true})
   -> 0.0062s
-- create_table(:comments, {:force=>true})
   -> 0.0003s
Calculating -------------------------------------
               assoc       833 i/100ms
              reader     28703 i/100ms
            combined       839 i/100ms
-------------------------------------------------
               assoc     9010.3 (±3.8%) i/s -      44982 in   5.000022s
              reader  3214523.4 (±5.5%) i/s -   16016274 in   5.001136s
            combined     8841.0 (±5.8%) i/s -      44467 in   5.049269s

[aaron@higgins rails (tracker)]$ TEST=ips bundle exec ruby ../1bb5456b5e035343df9d/gistfile1.rb
-- create_table(:posts, {:force=>true})
   -> 0.0060s
-- create_table(:comments, {:force=>true})
   -> 0.0003s
Calculating -------------------------------------
               assoc       888 i/100ms
              reader     29217 i/100ms
            combined       900 i/100ms
-------------------------------------------------
               assoc     9674.3 (±3.3%) i/s -      48840 in   5.054022s
              reader  2988474.8 (±6.9%) i/s -   14842236 in   4.998230s
            combined     9674.0 (±3.1%) i/s -      48600 in   5.028694s
bfc776f
Feb 15, 2014
Xavier Noria fxn implements new option :month_format_string for date select helpers [C…
…loses #13618]
5f295ae
Arun Agrawal arunagw Revert "Fixed plugin_generator test"
This reverts commit fefa8ae.
5f07366
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14069 from arunagw/aa-plugin-generator-build-fix
Revert "Fixed plugin_generator test"

As this commit  22a1a5a has reverted all changes so this plugin generator also needs to fix.
4914adc
Robin Dupret robin850 Add a missing changelog entry for #13981 and #14035
[ci skip]
0c63fbc
Kevin Casey Fortisque Correct prestreaming controller response status.
if the controller action has not yet streamed any data, actions should
process as normal, and errors should trigger the appropriate behavior
(500, or in the case of ActionController::BadRequest, a 400 Bad Request)
8508346
Rafael Mendonça França rafaelfranca Merge pull request #14072 from robin850/patch-16
Add a missing changelog entry for #13981 and #14035
8b80e3c
Feb 16, 2014
Vijay Dev vijaydev Merge pull request #13937 from ktaragorn/guides_fixes
Guides fixes
3e3ed1e
Guillermo Iguaran guilleiguaran Merge pull request #13512 from gsamokovarov/hstore_arrays_fix
Hstore arrays fix (follow up for #11444)
7c32db1
Rafael Mendonça França rafaelfranca Fix typo [ci skip] 99cdad6
Rafael Mendonça França rafaelfranca Don't skip tests if they are not broken. Just don't define they 141313c
Rafael Mendonça França rafaelfranca No need to use symbols c507f9f
Feb 17, 2014
Josh Goodall inopinatus Resolve encoding issues with arrays of hstore (bug 11135).
We didn't have enough encoding for the wire protocol to store an array
of hstore types. So, further encode any hstore that is an array member.
Whilst we're here, ensure it's an HashWithIndifferentAccess being
returned, to be consistent with other serialized forms, and add testing
for arrays of hstore.

So now the following migration:

  enable_extension "hstore"
  create_table :servers do |t|
    t.string  :name
    t.hstore  :interfaces, array: true
  end

produces a model that can used like this, to store an array of hashes:

  server = Server.create(name: "server01", interfaces: [
    { name: "bge0", ipv4: "192.0.2.2", state: "up" },
    { name: "de0", state: "disabled", by: "misha" },
    { name: "fe0", state: "up" },
  ])

More at http://inopinatus.org/2013/07/12/using-arrays-of-hstore-with-rails-4/
da3fec2
Rafael Mendonça França rafaelfranca Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"
This reverts commit 3ea8403, reversing
changes made to e4cde5d.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/query_methods.rb

Reason: using `from` without `select` should not change the select list
to SELECT * because it can lead different query results. If it is needed
to change the table to a subquery or a view you can pass a table alias
in the `from` call or use `select('subquery.*')`.

Fixes #14049.
a2075f4
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14087 from 10io/patch-1
Fix coffeescript sample [ci skip]
c18e7ab
Aaron Patterson tenderlove Merge pull request #14000 from Fortisque/kevin/stream_error_management
streaming should change status of response when exception is caught
f430836
Feb 18, 2014
Xavier Noria fxn time helpers honor the application time zone when passed a date
Rails applications are expected to be always aware of the application
time zone.

To be consistent with that contract, we have to assume that a bare
date passed to time helpers is a date in the application time zone,
not in the system time zone. The system time zone is irrelevant, we
should totally ignore it.

For example,

    travel_to user.birth_date + 40.years

should make that user be 40th years old regardless of the system
time zone. Without this patch that may not be true.
65a7c57
Xavier Noria fxn adds a missing travel back 24fa399
Xavier Noria fxn travel_to travels back and re-raises if the block raises 5d03781
Rashmi Yadav raysrashmi Updated doc for default scope [ci skip] a8a7654
Rafael Mendonça França rafaelfranca Tell default_scope are prepended [ci skip] 56c8242
Artem Chernikov kalabiyau Fix parameter naming in RemoteIp middleware constructor method
Was custom_proxies in inline docs, but should be and defined in
constructor as custom_proxies
4e84e12
Rafael Mendonça França rafaelfranca Aesthetic [ci skip] 28a0dd4
Arthur Nogueira Neves arthurnn Doc: assets:precompile:all was removed on 4 [skip ci] 4921d39
David Heinemeier Hansson dhh Added Object#present_in to simplify value whitelisting 4edca10
Guillermo Iguaran guilleiguaran Merge pull request #14096 from arthurnn/precompile_all
Upgrade Doc: assets:precompile:all was removed on 4
8c4ca89
David Heinemeier Hansson dhh Use assert_nil instead as its clearer about what the return is expect…
…ed to be
36bf5ac
Carlos Antonio da Silva carlosantoniodasilva Minor grammar/punctuation fixes [ci skip] 76fec33
Carlos Antonio da Silva carlosantoniodasilva Move changelog entry to the top, fix examples indent [ci skip] 68345d4
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14094 from kalabiyau/fix_parameters_naming
Fix parameter naming in RemoteIp middleware constructor method [ci skip]
67e57ea
Rafael Mendonça França rafaelfranca Document the default scopes change on the release notes, CHANGELOG
and upgrating guides

[ci skip]
6370e69
Rafael Mendonça França rafaelfranca Fix the column name [ci skip] 967a6dc
Rafael Mendonça França rafaelfranca Don't use `# =>` when it is not the expression values
[ci skip]
fc641a1
Rafael Mendonça França rafaelfranca Merge pull request #14095 from rails/rm-scopes
Document `default_scope` changes
6c496a6
Prem Sichanugrist sikachu Introduce `render :body` for render raw content
This is an option for sending a raw content back to browser. Note that
this rendering option will unset the default content type and does not
include "Content-Type" header back in the response.

You should only use this option if you are expecting the "Content-Type"
header to not be set. More information on "Content-Type" header can be
found on RFC 2616, section 7.2.1.

Please see #12374 for more detail.
103e18c
Prem Sichanugrist sikachu Update hash format for render_text_test 9e9cc66
Prem Sichanugrist sikachu Introduce `render :plain` for render plain text
This is as an option to render content with a content type of
`text/plain`. This is the preferred option if you are planning to render
a plain text content.

Please see #12374 for more detail.
8cd9f6d
Prem Sichanugrist sikachu Introduce `render :html` for render HTML string
This is an option for to HTML content with a content type of
`text/html`. This rendering option calls `ERB::Util.html_escape`
internally to escape unsafe HTML string, so you will have to mark your
string as html safe if you have any HTML tag in it.

Please see #12374 for more detail.
920f3ba
Prem Sichanugrist sikachu Fix a fragile test on `action_view/render`
This test were assuming that the list of render options will always be
the same. Fixing that so this doesn't break when we add/remove render
option in the future.
243e6e4
Prem Sichanugrist sikachu Cleanup `ActionController::Rendering` 79c4983
Prem Sichanugrist sikachu Update guides for new rendering options
* Introduces `:plain`, `:html`, `:body` render option.
* Update guide to use `render :plain` instead of `render :text`.
76be30f
Prem Sichanugrist sikachu Add missing CHANGELOG entry to Action View 9fe506e
Prem Sichanugrist sikachu Add `#no_content_type` attribute to `AD::Response`
Setting this attribute to `true` will remove the content type header
from the request. This is use in `render :body` feature.
3047376
Prem Sichanugrist sikachu Update upgrading guide regarding `render :text` ede0f8c
Rafael Mendonça França rafaelfranca Merge pull request #14062 from sikachu/ps-render-format
Introduce `:plain`, `:html`, and `:body` render options.
acc0e63
Godfrey Chan chancancode Sync 4.1 release notes with changes since 7f648bc [ci skip] 578839b
Godfrey Chan chancancode Merge pull request #14097 from chancancode/sync_4_1_release_notes
Sync 4.1 release notes with changes since 7f648bc
4f23760
Rafael Mendonça França rafaelfranca Escape format, negative_format and units options of number helpers
Previously the values of these options were trusted leading to
potential XSS vulnerabilities.

Fixes: CVE-2014-0081
08d0a11
Aaron Patterson tenderlove Correctly escape PostgreSQL arrays.
Thanks Godfrey Chan for reporting this!

Fixes: CVE-2014-0080
6256b1d
Rafael Mendonça França rafaelfranca Preparing for 4.1.0.beta2 release 8b20c72
Rafael Mendonça França rafaelfranca Merge branch '4-1-0-beta2'
Conflicts:
	actionview/CHANGELOG.md
	activerecord/CHANGELOG.md
1879c25
Rafael Mendonça França rafaelfranca Use the reference for the mime type to get the format
Before we were calling to_sym in the mime type, even when it is unknown
what can cause denial of service since symbols are not removed by the
garbage collector.

Fixes: CVE-2014-0082
33cb47e
Amit Thawait Amit-Thawait Typo fix for unscope b74490e
Arthur Nogueira Neves arthurnn Merge pull request #14098 from Amit-Thawait/master
Typo fix for unscope [ci skip]
5dc6bf5
Roberto Miranda robertomiranda Update Docs in favor to use render plain instead of text option
ref #14062
e220a34
Guillermo Iguaran guilleiguaran Merge pull request #14099 from robertomiranda/render-text-2-plain
Update Docs in favor to use render plain instead of text option
11645ad
Guillermo Iguaran guilleiguaran Fix render plain docs example in AM::Base
The errors were introduced in e220a34
1c248df
Feb 19, 2014
Prakash Murthy prakashmurthy [ci skip] Close the meta tag with '/>' instead of '>'
This change fixes the 42 instances of `end tag for "meta" omitted, but
OMITTAG NO was specified` error message that comes up when the full
railsguides are validated.

Full error list at
https://gist.github.com/prakashmurthy/9086679.
9b3be63
Arun Agrawal arunagw Merge pull request #14107 from prakashmurthy/patch-1
Close the meta tag with '/>' instead of '>'
a0d63c3
Arthur Nogueira Neves arthurnn Methods silence_stream/quietly are not thread-safe [skip ci]
State that on the doc.

[fixes #11954]
7a025b1
Xavier Noria fxn Merge pull request #14102 from arthurnn/quietly_doc
Add note to silence_stream and quietly. [skip ci]
a26394d
Arun Agrawal arunagw Pointing to latest guides [ci skip] 25ce856
Feb 20, 2014
Greg Molnar gregmolnar change 'assert !' to 'assert_not' in guides [ci skip] fa8d35b
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #14120 from gregmolnar/guides
change 'assert !' to 'assert_not' in guides [ci skip]
1774618
Vijay Dev vijaydev Merge branch 'master' of github.com:rails/docrails b078f5e
Aaron Patterson tenderlove Merge branch 'master' into jobs
* master: (1455 commits)
  change 'assert !' to 'assert_not' in guides [ci skip]
  Pointing to latest guides [ci skip]
  Methods silence_stream/quietly are not thread-safe [skip ci]
  [ci skip] Close the meta tag with '/>' instead of '>'
  Fix render plain docs example in AM::Base
  Update Docs in favor to use render plain instead of text option ref #14062
  Typo fix for unscope
  Use the reference for the mime type to get the format
  Preparing for 4.1.0.beta2 release
  Correctly escape PostgreSQL arrays.
  Escape format, negative_format and units options of number helpers
  Sync 4.1 release notes with changes since 7f648bc [ci skip]
  Update upgrading guide regarding `render :text`
  Add `#no_content_type` attribute to `AD::Response`
  Add missing CHANGELOG entry to Action View
  Update guides for new rendering options
  Cleanup `ActionController::Rendering`
  Fix a fragile test on `action_view/render`
  Introduce `render :html` for render HTML string
  Introduce `render :plain` for render plain text
  ...

Conflicts:
	actionmailer/lib/action_mailer/railtie.rb
	railties/lib/rails/application.rb
	railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
	railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
96a3216