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: andhapp/rails
...
head fork: andhapp/rails
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jul 16, 2012
Steve Jorgensen Don't crash exception translation w/ nil result attribute.
Exception.result is nil when attempting a query after PostgreSQL
disconnect, resulting in new exception:
NoMethodError: undefined method `error_field' for nil:NilClass
0d63cda
Steve Jorgensen Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.
6d5f4de
Steve Jorgensen Stop being silly with formatting of method aliasing.
4b1bca0
Commits on Jul 25, 2012
@yahonda yahonda Use string datatype for the setting attribute
to make store works all database adapters.
05895c6
@rafaelfranca rafaelfranca Merge pull request #7158 from yahonda/use_string_for_settings
Use string datatype for the setting attribute
b5c2384
@tenderlove tenderlove Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2
Postgresql auto reconnect 2
0dc356e
Commits on Jul 26, 2012
@michaelfairley michaelfairley Eager autoload ActiveRecord association helpers
a052fc9
@parndt parndt Switched update_column recommendation in changelog to update_columns
Related to #7164

Looks like the last one; thanks!
ffe8b0a
@rafaelfranca rafaelfranca Merge pull request #7165 from parndt/patch-5
Switched update_column recommendation in changelog to update_columns
dc464b9
@ayrton ayrton Update activerecord/CHANGELOG.md
Fixed markdown code indenting
c046a29
@jonleighton jonleighton Merge pull request #7161 from michaelfairley/eager_load_active_record…
…_association_helpers

Eager autoload ActiveRecord association helpers
07c455d
@jonleighton jonleighton Merge pull request #7166 from ayrton/patch-1
Update activerecord/CHANGELOG.md
88c205b
@route route Missed extend for eager_autoload
8cf300c
@josevalim josevalim Merge pull request #7167 from route/missed_extend
Missed extend for eager_autoload
b1d7283
@beerlington beerlington Refactor ActiveRecord::Inheritance.base_class logic
Moved logic from class_of_active_record_descendant(class) to the
base_class method. This method was confusing because it required
an argument, but that argument was 'self'.

Moved base_class tests to inheritance_test.rb and added some test
coverage for some untested cases.
d0aebd5
@makaroni4 makaroni4 fix typo in documentation
103a313
@rafaelfranca rafaelfranca Merge pull request #7170 from makaroni4/master
Fix typo in documentation
f4c2a12
@rafaelfranca rafaelfranca Merge pull request #7171 from beerlington/refactor_inheritance_base_c…
…lass

Refactor ActiveRecord::Inheritance.base_class logic
90c9ae5
@tenderlove tenderlove * Do not convert digest auth strings to symbols. CVE-2012-3424
Conflicts:
	actionpack/lib/action_controller/metal/http_authentication.rb
fee0bc5
Commits on Jul 27, 2012
@yahonda yahonda Modify the preference attribute from `:null => false` to `:null => true`
to address ORA-01400 errors with Oracle enhanced adapter.

Issue #4856 had been fixed and tested with
the attribute `:null => false, :default => ""`.
Now `:null => false` attribute is not necessary to test this issue.
dab8ca5
@rafaelfranca rafaelfranca Merge pull request #7173 from yahonda/address_7138
Modify the preference attribute from `:null => false` to `:null => true`
87f3bd0
@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.

Conflicts:
	activerecord/lib/active_record/railties/databases.rake
f1afd77
Something went wrong with that request. Please try again.