Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
Commits on Jul 16, 2012
@jmazzi jmazzi Update documentation for Rails::Application#env_config c6ad167
Commits on Jul 25, 2012
@smartinez87 smartinez87 New #update_columns method. f27a8eb
@parndt parndt Suggest using update_columns instead of update_column.
update_column is deprecated in Rails 4.0 so it makes no sense to
recommend adopting it only to require changing to update_columns
in the very next release.
a0b85b9
@tenderlove tenderlove Merge pull request #7159 from parndt/update_columns
Backport update_columns to Rails 3.2
def9c85
Commits on Jul 26, 2012
@carlosantoniodasilva carlosantoniodasilva Fix AR#update_columns tests on Ruby 1.8.7 17a64de
@parndt parndt Switched update_column recommendation in changelog to update_columns
This is related to #7159
9fa06c3
@rafaelfranca rafaelfranca Merge pull request #7164 from parndt/patch-4
Switched update_column recommendation in changelog to update_columns
3dae440
@tenderlove tenderlove Merge branch '3-2-rel' into 3-2-stable
* 3-2-rel:
  updating release date
  bumping to 3.2.7
  updating the changelog
  * Do not convert digest auth strings to symbols. CVE-2012-3424
  updating the version
  updating changelogs
133754e
Commits on Jul 27, 2012
@rafaelfranca rafaelfranca Only require the `:rails_env` task where is needed.
`:rails_env` tasks is not needed in all the tasks that depends of
`load_config`, only in the tasks that uses `Rails.env`.

Since `:rails_env` task set the `Rails.env` to be "development" if it is
not set we don't need the `||` statements too

Fix #7175.
4b8b8c1
@fxn fxn adds a missing require from Active Support
This file uses mattr_accessor.
db340da
Commits on Jul 28, 2012
@fxn fxn missing require: the AR session store depends on the AP abstract store
This require makes the dependency even more clear.
In particular we are eager loading the session
store but that does not work if AR is used
outside Rails, this patch is preliminary work
in fixing #7160.
bf16456
Francesco Rodriguez Backport #6995 to 3-2 stable
Update `test_help` to config properly turn natural language option.
Last versions of Turn don't monkey patch MiniTest to setup
the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3).

This patches the following behaviour:

    $ rake test:units
    `<top (required)>': undefined method `use_natural_language_case_names='
    for MiniTest::Unit:Class (NoMethodError)
3326b8b
@rafaelfranca rafaelfranca Merge pull request #7187 from frodsan/fix_test_help
Backport #6995 to 3-2 stable
be408d6
@fxn fxn removes the AR session store from eager loaded code [fixes #7160]
See the comment in the file activerecord/lib/active_record.rb
added by this patch for the rationale.
cc712f2
Commits on Jul 30, 2012
@rafaelfranca rafaelfranca Revert "Add update_columns and the suggestion of using update_columns
instead of update_column"

This reverts commit 9fa06c3.

This reverts commit 17a64de.

This reverts commit def9c85, reversing
changes made to 6b7d26c.

Reason: This was supposed to be released with 3.2.7 before the
suggestion to use update_column. Since it was not release now is not
good to suggest to use another method because it will confusing the
people.
2f930df
Commits on Jul 31, 2012
@rafaelfranca rafaelfranca Add CHANGELOG entry [ci skip] a893672
Commits on Aug 01, 2012
@rafaelfranca rafaelfranca Merge pull request #7147 from pferdefleisch/scaffold_controller_docs
Updated scaffold_controller generator docs #7146
69fd0e8
@rafaelfranca rafaelfranca Merge pull request #7070 from jmazzi/3-2-stable
Update documentation for Rails::Application#env_config
3e01a2a
@spastorino spastorino Add missing CHANGELOG entries
[ci skip]
6764b7b
@jonleighton jonleighton Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."
This reverts commit a79bfa9.

Conflicts:
	activerecord/CHANGELOG.md

We shouldn't introducing deprecations in point releases.
It will be deprecated in 4.0 instead.
0c52702
@rafaelfranca rafaelfranca Revert "Deprecating composed_of in ActiveRecord"
This reverts commit 44b313b.
736bf14
@rafaelfranca rafaelfranca Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Tex…
…t' }` option"

Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers."

This reverts commit fc092a9.
This reverts commit e9051e2.
This reverts commit d47d6e7.
This reverts commit 21141e7.
89177ba
@fxn fxn revises the deprecation warning of update_attribute
We have decided not to drop this important method in 4.0 and give
it a longer deprecation cycle. On the other hand we do not expect
to have update_column around for a long time, it is going to be
replaced in favor of update_columns.
f203be9
@fxn fxn removes the deprecation of update_attribute
Applying the new policy here to not deprecate stuff in point releases.
81542f9
@rafaelfranca rafaelfranca Fix CHANGELOGS 857697b
@rafaelfranca rafaelfranca Revert "Deprecate ActiveSupport::JSON::Variable"
This reverts commit bcfa013.
af65b8c
@rafaelfranca rafaelfranca Revert "Deprecate `:mouseover` options for `image_tag` helper."
This reverts commit 1aff772.

Conflicts:
	actionpack/CHANGELOG.md
e826a5c
@rafaelfranca rafaelfranca Revert "Deprecate link_to_function and button_to_function helpers"
This reverts commit 9dc57fe.
f50a5d2
@spastorino spastorino Bump to 3.2.8.rc1 fcccbac
@spastorino spastorino This entry is wrong 74cf196
Commits on Aug 02, 2012
@ffmike ffmike Fix ActiveSupport integration with Mocha > 0.12.1
Mocha 0.12.2 renames the Integration module to
MonkeyPatching. This breaks the code Rails uses
to retrieve the assertion counter from Mocha.
5c42889
@rafaelfranca rafaelfranca Do not consider the numeric attribute as changed if the old value is
zero and the new value is not a string.

Before this commit this was the behavior

r = Review.find_by_issue(0)
r.issue
=> 0
r.changes
=> {}
r.issue = 0
=> 0
r.changed?
=> true
r.changes
=> {"issue"=>[0,0]}

Fixes #7237
55e05d4
@rafaelfranca rafaelfranca Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at
the ERB scaffold generator.

We are trying to teach the data attributes as best practices and
`:confirm` will be deprecated in 4.0.
9c1b1bd
@spastorino spastorino html_escape should escape single quotes
https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
Closes #7215

Conflicts:
	actionpack/test/template/erb_util_test.rb
	actionpack/test/template/form_tag_helper_test.rb
	actionpack/test/template/text_helper_test.rb
	actionpack/test/template/url_helper_test.rb
	activesupport/lib/active_support/core_ext/string/output_safety.rb
28f2c6f
@rafaelfranca rafaelfranca Fix html_escape with Ruby 1.8 ebddf75
@rafaelfranca rafaelfranca More `:rails_env` cleanup.
`Rails.env` already use development if ENV["RAILS_ENV"] is not present.
469d885
Commits on Aug 03, 2012
@spastorino spastorino Add CHANGELOG entry 5f9ae95
@spastorino spastorino Bump to 3.2.8.rc2 65b5e35
Commits on Aug 09, 2012
@spastorino spastorino escape select_tag :prompt values
CVE-2012-3463
6d0526d
@spastorino spastorino Do not mark strip_tags result as html_safe
Thanks to Marek Labos & Nethemba

CVE-2012-3465
e91e4e8
@spastorino spastorino Add release date to CHANGELOGs ddedf5d
@spastorino spastorino Bump to 3.2.8 64146cf