Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: rails/rails
...
head fork: rails/rails
Commits on Jun 12, 2012
Angelo Capilleri acapilleri Fix the the backport of the object dup with the ruby 1.9.3p194.
At the end of initialize_dup was added the call to super if it exists,
so it also works with 1.8.7 where initialize_dup doesn't exist.
This issu was introduced with the pull request #6324
b97e0a1
Rafael Mendonça França rafaelfranca Merge pull request #6682 from acapilleri/dup_validation_fix_backport_…
…for_1_9_3

Dup validation fix backport for 1 9 3
6522a12
Rafael Mendonça França rafaelfranca Merge pull request #6676 from aurelian/master
Don't assign the attributes if the list is empty
32709ea
Rafael Mendonça França rafaelfranca Merge pull request #6715 from arunagw/add_asserts
Need a assert here in tests
5dd2cfc
Aaron Patterson tenderlove Merge branch '3-2-stable-rel' into 3-2-stable
* 3-2-stable-rel:
  updating changelogs
  bumping version numbers
  updating changelogs with security fixes
  updating changelogs
  Array parameters should not contain nil values.
  Additional fix for CVE-2012-2661
10cdbbc
Francesco Rodríguez frodsan Fix build eed1cfe
Rafael Mendonça França rafaelfranca Merge pull request #6716 from frodsan/patch-2
Fix Build
966371a
Commits on Jun 13, 2012
Santiago Pastorino spastorino ActionController::Caching depends on RackDelegation and AbstractContr…
…oller::Callbacks
7f93791
Commits on Jun 14, 2012
Aaron Patterson tenderlove adding a test for #6459 e7d1849
Steve Klabnik steveklabnik Deprecate update_attribute.
Historically, update_attribute and update_attributes are similar, but
with one big difference: update_attribute does not run validations.
These two methods are really easy to confuse given their similar
names. Therefore, update_attribute is being deprecated in favor of
update_column, and will be removed in Rails 4.

See the discussion on rails-core here:
https://groups.google.com/d/topic/rubyonrails-core/BWPUTK7WvYA/discussion
b081f6b
Xavier Noria fxn Merge pull request #6739 from steveklabnik/3-2-stable
Deprecate update_attribute
63bcfbb
Xavier Noria fxn registers the deprecation of update_attribute in the CHANGELOG 2109fd5
Rafael Mendonça França rafaelfranca Remove unneded tests.
Before b081f6b, this test are
asserting that update_attribute does the dirty tracking. Since we
deprecated this method and update_column write in the database directly
this tests will always fail.
a8e22ae
Commits on Jun 15, 2012
Dmitry Vorotilin route ActionController::Metal doesn't have logger method, check it and then…
… delegate
3b1ea3d
Dmitry Vorotilin route Added test for case when view doesn't have logger method when using A…
…ctionController::Metal controller.
4717c2f
Commits on Jun 16, 2012
Rafael Mendonça França rafaelfranca Merge pull request #6752 from steveklabnik/fix_5680
Respect absolute paths in compute_source_path.
52d0963
Arun Agrawal arunagw It should also include text/css => Build Fix 909a4a5
Rafael Mendonça França rafaelfranca Merge pull request #6756 from arunagw/build_fix_ap
Build fix actionpack
ed93c86
Commits on Jun 18, 2012
Francesco Rodríguez frodsan bump AS deprecation_horizon to 4.0 a556c7e
Rafael Mendonça França rafaelfranca Merge pull request #6764 from frodsan/patch-4
bump AS deprecation_horizon to 4.0
284ebf2
José Valim josevalim Use strict_args_position! if available from Thor 83451be
Steve Klabnik steveklabnik Deprecating composed_of in ActiveRecord
This feature adds a lot of complication to ActiveRecord for dubious
value. Let's talk about what it does currently:

class Customer < ActiveRecord::Base
  composed_of :balance, :class_name => "Money", :mapping => %w(balance
amount)
end

Instead, you can do something like this:

    def balance
      @balance ||= Money.new(value, currency)
    end

    def balance=(balance)
      self[:value] = balance.value
      self[:currency] = balance.currency
      @balance = balance
    end

Since that's fairly easy code to write, and doesn't need anything
extra from the framework, if you use composed_of today, you'll
have to add accessors/mutators like that.

This feature will be removed in Rails 4.
44b313b
Rafael Mendonça França rafaelfranca Merge pull request #6742 from steveklabnik/deprecate_composed_of
Deprecate composed of
ffcecf2
Commits on Jun 19, 2012
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #6649 from route/logger_in_metal_3_2
Logger in metal backport for 3.2
2363aaf
José Valim josevalim Merge pull request #6758 from caironoleto/master
Fixing load config in some tasks
Conflicts:
	activerecord/lib/active_record/railties/databases.rake
94489a2
Commits on Jun 21, 2012
Rafael Mendonça França rafaelfranca Merge branch 'acapilleri-update_nested_attributes'
Closes #6675

Conflicts:
	activerecord/lib/active_record/attribute_methods/dirty.rb
40617c7
Rafael Mendonça França rafaelfranca Remove waning of unused variable 200e6a6
Commits on Jun 24, 2012
Rafael Mendonça França rafaelfranca Merge pull request #6842 from ernie/handle-non-strings-in-grouped-cal…
…culations

Stop assuming strings for grouped calculations
Conflicts:
	activerecord/lib/active_record/relation/calculations.rb
12ac977
Commits on Jun 25, 2012
Carlos Antonio da Silva carlosantoniodasilva Ensure Arel columns are typecasted properly when grouping with calcul…
…ation

Fix build issue with postgresql.

Conflicts:
	activerecord/lib/active_record/relation/calculations.rb
	activerecord/test/cases/calculations_test.rb
f8f4ac9
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require
Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+
3fccf6a
Commits on Jun 28, 2012
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #6900 from cbandy/issue-6898
Require URI in ConnectionSpecification
Conflicts:
	activerecord/lib/active_record/connection_adapters/connection_specification.rb
10e5685
Rafael Mendonça França rafaelfranca Merge pull request #6878 from masarakki/master
fix bug in limit of enum columns of mysql

Closes #6432
48601c2
Commits on Jun 29, 2012
Xavier Noria fxn make sure the inflection rules are loaded when cherry-picking active_…
…support/core_ext/string/inflections.rb [fixes #6884]
9e0b3fc
Commits on Jul 02, 2012
Francesco Rodríguez frodsan Backport #3329 to 3-2-stable
Fix bug with autosave collection association on new record with a marked
for destroy record in autosave collection.

Fixes #6918.
b1e509a
Rafael Mendonça França rafaelfranca Merge pull request #6935 from frodsan/b1e509ad7a8c8264544f10f4666705c…
…d806b5408

Backport #3329 to 3-2-stable
dacc947
Commits on Jul 03, 2012
Mark J. Titorenko mjtko Fix NumberHelper options wrapping to prevent verbatim blocks being re…
…ndered instead of line continuations. While I'm at it, wrap long comment lines consistently.

Conflicts:
	actionpack/lib/action_view/helpers/number_helper.rb

There was just one conflict related to the addition of the :format
option to number_to_percentage.
7faa620
Commits on Jul 05, 2012
Dmitry Vorotilin route Show in log correct wrapped keys ffdca21
Rafael Mendonça França rafaelfranca Merge pull request #6973 from route/wrapped_keys_in_log_for_3_2
MIssed backport for 3.2
c7afc42
Commits on Jul 06, 2012
José Valim josevalim Since Rails 3.2, use layout false to render no layout 03dcdc3
Rafael Mendonça França rafaelfranca Merge pull request #6985 from sidonath/disable-query-cache-for-locks
Disable query cache for lock queries
Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
7adc4f2
Commits on Jul 09, 2012
Prem Sichanugrist sikachu Update coding convention from master 904eace
Xavier Noria fxn Merge pull request #7015 from sikachu/3-2-stable-code-style
Update coding convention from master
45d78a3
Commits on Jul 10, 2012
rustygeldmacher rustygeldmacher Fixed bug creating invalid HTML in select options
When a select tag is created for a field with errors, and that select
tag has :prompt or :include_blank options, then the inserted first
option will errantly have a <div class="field_with_errors"> wrapping
it.

See #7017
27c8deb
Rafael Mendonça França rafaelfranca Merge pull request #7025 from rustygeldmacher/select_options_valid_html
Select options valid html
3b1de4a
Commits on Jul 11, 2012
Robb Kidd robbkidd Update psql adapter to rename a default pkey sequence during rename_t…
…able.
8d3eafe
Piotr Sarnacki drogus Merge pull request #7031 from robbkidd/rename_sequences_too_backport_…
…to_3-2

Back-port #6874 to 3.2: psql adapter should rename a default pk sequence during rename_table
e72d876
Commits on Jul 13, 2012
Jeremy Cole jeremycole Only use prepared statements when bind variables are present
Prepared statements (prepare/execute/close) were being used unnecessarily
when no bind variables were present, and disabling prepared statement using
prepared_statements:false was principally broken. While bind variables were
correctly substituted with prepared_statements:false, the prepared statement
interface was still used, costing an extra two round trips per query.

In addition to making this behavioral change, I also cleaned up the internals
of exec_stmt and exec_without_stmt so that they behave the same (calling log
and constructing the ActiveRecord::Result in the same way).

Moving the check for binds.empty? to exec_query also will mean that several
code paths explicitly calling exec_without_stmt could be cleaned up to once
again call exec_query instead. I have also left the check for binds.empty? in
exec_stmt, since it is not a private method and could be called directly with
an empty binds array. For the sake of clarity in this patch, I have not made
those changes.

= The previous behavior =

When issuing a Foo.find(1) with prepared_statements:true, the bind variable
is present in the prepared query, and execute shows a value passed:

    Connect	root@localhost on rails_test
    Query	SET SQL_AUTO_IS_NULL=0
    Statistics
    Query	SHOW FULL FIELDS FROM `foos`
    Query	SHOW TABLES LIKE 'foos'
    Query	SHOW CREATE TABLE `foos`
    Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
    Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Close stmt
    Quit

When issuing a Foo.find(1) with prepared_statements:false, the bind variable
has already been removed and substituted with the value, but the prepared
statement interface is used anyway:

    Connect	root@localhost on rails_test
    Query	SET SQL_AUTO_IS_NULL=0
    Statistics
    Query	SHOW FULL FIELDS FROM `foos`
    Query	SHOW TABLES LIKE 'foos'
    Query	SHOW CREATE TABLE `foos`
    Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Close stmt
    Quit

= With this patch applied =

When issuing a Foo.find(1) with prepared_statements:true, the bind variable
is present in the prepared query, and execute shows a value passed:

    Connect	root@localhost on rails_test
    Query	SET SQL_AUTO_IS_NULL=0
    Statistics
    Query	SHOW FULL FIELDS FROM `foos`
    Query	SHOW TABLES LIKE 'foos'
    Query	SHOW CREATE TABLE `foos`
    Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
    Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Close stmt
    Quit

When issuing a Foo.find(1) with prepared_statements:false, the bind variable
has been removed and substituted with the value, and the query interface is
used instead of the prepared statement interface:

    Connect	root@localhost on rails_test
    Query	SET SQL_AUTO_IS_NULL=0
    Statistics
    Query	SHOW FULL FIELDS FROM `foos`
    Query	SHOW TABLES LIKE 'foos'
    Query	SHOW CREATE TABLE `foos`
    Query	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Quit
e4ef90a
Jeremy Cole jeremycole Fixing texts; down to three failing tests. 8f43230
Aaron Patterson tenderlove fixing tests to deal with data differences between prepared statement…
…s and non-prepared statements
f7ef7ca
Commits on Jul 14, 2012
Xavier Noria fxn adds a missing require [fixes #6896]
This file uses Time.zone, which is defined in
active_support/core_ext/time/zones.rb.
b3693bf
Commits on Jul 17, 2012
Rafael Mendonça França rafaelfranca Merge pull request #4396 from kennyj/fix_4259
Fix GH #4259. When we execute schema dumper, we must remove table_name_prefix and table_name_suffix.
e23ec4c
Andrew White pixeltrix Add support for optional root segments containing slashes
Optional segments with a root scope need to have the leading slash
outside of the parentheses, otherwise the generated url will be empty.
However if the route has non-optional elements then the leading slash
needs to remain inside the parentheses otherwise the generated url
will have two leading slashes, e.g:

Blog::Application.routes.draw do
  get '/(:category)', :to => 'posts#index', :as => :root
  get '/(:category)/author/:name', :to => 'posts#author', :as => :author
end

$ rake routes
  root GET /(:category)(.:format)              posts#index
author GET (/:category)/author/:name(.:format) posts#author

This change adds support for optional segments that contain a slash,
allowing support for urls like /page/2 for the root path, e.g:

Blog::Application.routes.draw do
  get '/(page/:page)', :to => 'posts#index', :as => :root
end

$ rake routes
root GET /(page/:page)(.:format) posts#index

Fixes #7073
(cherry picked from commit d8745de)
71d274d
John Firebaugh jfirebaugh AR::Integration must be included after AM::Conversion
Integration's definition of #to_param must override
Conversion's. Otherwise, there is a regression from
3.1 in the behavior of a non-persisted AR::Base instance
which nevertheless has an id.
9b5309f
Jon Leighton jonleighton Merge pull request #7080 from jfirebaugh/to_param_regression
AR::Integration must be included after AM::Conversion
827f369
Commits on Jul 19, 2012
Arun Agrawal arunagw Bumping mocha!
Reason:- 0.12.0 introduced a bug where you got a exception
which is now in 0.12.1 is a warning only!
89dee0e
Rafael Mendonça França rafaelfranca Merge pull request #7108 from arunagw/mocha_bump
Bumping mocha!
22880de
Commits on Jul 20, 2012
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3
Resolver tests fail if mysql adapter not installed
b16e7ed
Jon Leighton jonleighton Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql. a79bfa9
Rafael Mendonça França rafaelfranca `validates_inclusion_of` and `validates_exclusion_of` now accept
`:within` option as alias of `:in` as documented.

Fix #7118
089371a
Commits on Jul 21, 2012
Xavier Noria fxn Hash#fetch(fetch) is not the same as doing hash[key] a37b90c
Commits on Jul 23, 2012
Andrew White pixeltrix Bump Journey requirements to 1.0.4
There are some Action Pack tests for regressions from 3.1 that require
a later version of Journey to pass so bump to the current version.
6b7d26c
Aaron Patterson tenderlove updating changelogs 125dfdf
Aaron Patterson tenderlove updating the version 753c546
Commits on Jul 26, 2012
Aaron Patterson tenderlove * Do not convert digest auth strings to symbols. CVE-2012-3424 27311fe
Aaron Patterson tenderlove updating the changelog fb89f6f
Aaron Patterson tenderlove bumping to 3.2.7 21bcac1
Aaron Patterson tenderlove updating release date d1b9cf2