Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix behavior of rake db:structure:load for 3.2.8 #7985

Closed
wants to merge 1,098 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1098 commits
Select commit Hold shift + click to select a range
e7d1849
adding a test for #6459
tenderlove Jun 14, 2012
b081f6b
Deprecate update_attribute.
steveklabnik Jun 14, 2012
63bcfbb
Merge pull request #6739 from steveklabnik/3-2-stable
fxn Jun 14, 2012
2109fd5
registers the deprecation of update_attribute in the CHANGELOG
fxn Jun 14, 2012
a8e22ae
Remove unneded tests.
rafaelfranca Jun 14, 2012
3b1ea3d
ActionController::Metal doesn't have logger method, check it and then…
route Jun 5, 2012
4717c2f
Added test for case when view doesn't have logger method when using A…
route Jun 15, 2012
52d0963
Merge pull request #6752 from steveklabnik/fix_5680
rafaelfranca Jun 16, 2012
909a4a5
It should also include text/css => Build Fix
arunagw Jun 16, 2012
ed93c86
Merge pull request #6756 from arunagw/build_fix_ap
rafaelfranca Jun 16, 2012
a556c7e
bump AS deprecation_horizon to 4.0
Jun 18, 2012
284ebf2
Merge pull request #6764 from frodsan/patch-4
rafaelfranca Jun 18, 2012
83451be
Use strict_args_position! if available from Thor
Jun 18, 2012
44b313b
Deprecating composed_of in ActiveRecord
steveklabnik Jun 15, 2012
ffcecf2
Merge pull request #6742 from steveklabnik/deprecate_composed_of
rafaelfranca Jun 18, 2012
2363aaf
Merge pull request #6649 from route/logger_in_metal_3_2
carlosantoniodasilva Jun 19, 2012
94489a2
Merge pull request #6758 from caironoleto/master
Jun 17, 2012
40617c7
Merge branch 'acapilleri-update_nested_attributes'
rafaelfranca Jun 19, 2012
200e6a6
Remove waning of unused variable
rafaelfranca Jun 21, 2012
12ac977
Merge pull request #6842 from ernie/handle-non-strings-in-grouped-cal…
rafaelfranca Jun 24, 2012
f8f4ac9
Ensure Arel columns are typecasted properly when grouping with calcul…
carlosantoniodasilva Jun 25, 2012
3fccf6a
Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require
carlosantoniodasilva Jun 25, 2012
10e5685
Merge pull request #6900 from cbandy/issue-6898
carlosantoniodasilva Jun 28, 2012
48601c2
Merge pull request #6878 from masarakki/master
rafaelfranca Jun 27, 2012
9e0b3fc
make sure the inflection rules are loaded when cherry-picking active_…
fxn Jun 29, 2012
b1e509a
Backport #3329 to 3-2-stable
Jul 2, 2012
dacc947
Merge pull request #6935 from frodsan/b1e509ad7a8c8264544f10f4666705c…
rafaelfranca Jul 2, 2012
7faa620
Fix NumberHelper options wrapping to prevent verbatim blocks being re…
mjtko May 8, 2012
ffdca21
Show in log correct wrapped keys
route Apr 29, 2012
c7afc42
Merge pull request #6973 from route/wrapped_keys_in_log_for_3_2
rafaelfranca Jul 5, 2012
03dcdc3
Since Rails 3.2, use layout false to render no layout
Jul 6, 2012
7adc4f2
Merge pull request #6985 from sidonath/disable-query-cache-for-locks
rafaelfranca Jul 6, 2012
904eace
Update coding convention from master
sikachu Jul 9, 2012
45d78a3
Merge pull request #7015 from sikachu/3-2-stable-code-style
fxn Jul 9, 2012
27c8deb
Fixed bug creating invalid HTML in select options
Jul 10, 2012
3b1de4a
Merge pull request #7025 from rustygeldmacher/select_options_valid_html
rafaelfranca Jul 10, 2012
8d3eafe
Update psql adapter to rename a default pkey sequence during rename_t…
robbkidd Jul 11, 2012
e72d876
Merge pull request #7031 from robbkidd/rename_sequences_too_backport_…
drogus Jul 11, 2012
e4ef90a
Only use prepared statements when bind variables are present
jeremycole Jul 13, 2012
8f43230
Fixing texts; down to three failing tests.
jeremycole Jul 13, 2012
f7ef7ca
fixing tests to deal with data differences between prepared statement…
tenderlove Jul 13, 2012
b3693bf
adds a missing require [fixes #6896]
fxn Jul 14, 2012
c6ad167
Update documentation for Rails::Application#env_config
jmazzi Jul 16, 2012
e23ec4c
Merge pull request #4396 from kennyj/fix_4259
rafaelfranca Jun 20, 2012
71d274d
Add support for optional root segments containing slashes
pixeltrix Jul 17, 2012
9b5309f
AR::Integration must be included after AM::Conversion
jfirebaugh Jul 17, 2012
827f369
Merge pull request #7080 from jfirebaugh/to_param_regression
jonleighton Jul 17, 2012
89dee0e
Bumping mocha!
arunagw Jul 19, 2012
22880de
Merge pull request #7108 from arunagw/mocha_bump
rafaelfranca Jul 19, 2012
b16e7ed
Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3
carlosantoniodasilva Jun 5, 2012
a79bfa9
Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.
jonleighton Jul 20, 2012
089371a
`validates_inclusion_of` and `validates_exclusion_of` now accept
rafaelfranca Jul 20, 2012
a37b90c
Hash#fetch(fetch) is not the same as doing hash[key]
fxn Jul 21, 2012
6b7d26c
Bump Journey requirements to 1.0.4
pixeltrix Jul 23, 2012
125dfdf
updating changelogs
tenderlove Jul 23, 2012
753c546
updating the version
tenderlove Jul 23, 2012
f27a8eb
New #update_columns method.
smartinez87 May 21, 2011
a0b85b9
Suggest using update_columns instead of update_column.
parndt Jul 25, 2012
def9c85
Merge pull request #7159 from parndt/update_columns
tenderlove Jul 25, 2012
17a64de
Fix AR#update_columns tests on Ruby 1.8.7
carlosantoniodasilva Jul 26, 2012
9fa06c3
Switched update_column recommendation in changelog to update_columns
parndt Jul 26, 2012
3dae440
Merge pull request #7164 from parndt/patch-4
rafaelfranca Jul 26, 2012
27311fe
* Do not convert digest auth strings to symbols. CVE-2012-3424
tenderlove Jul 26, 2012
fb89f6f
updating the changelog
tenderlove Jul 26, 2012
21bcac1
bumping to 3.2.7
tenderlove Jul 26, 2012
d1b9cf2
updating release date
tenderlove Jul 26, 2012
133754e
Merge branch '3-2-rel' into 3-2-stable
tenderlove Jul 26, 2012
4b8b8c1
Only require the `:rails_env` task where is needed.
rafaelfranca Jul 27, 2012
db340da
adds a missing require from Active Support
fxn Jul 27, 2012
bf16456
missing require: the AR session store depends on the AP abstract store
fxn Jul 28, 2012
3326b8b
Backport #6995 to 3-2 stable
Jul 28, 2012
be408d6
Merge pull request #7187 from frodsan/fix_test_help
rafaelfranca Jul 28, 2012
cc712f2
removes the AR session store from eager loaded code [fixes #7160]
fxn Jul 28, 2012
2f930df
Revert "Add update_columns and the suggestion of using update_columns
rafaelfranca Jul 30, 2012
a893672
Add CHANGELOG entry [ci skip]
rafaelfranca Jul 31, 2012
69fd0e8
Merge pull request #7147 from pferdefleisch/scaffold_controller_docs
rafaelfranca Aug 1, 2012
3e01a2a
Merge pull request #7070 from jmazzi/3-2-stable
rafaelfranca Aug 1, 2012
6764b7b
Add missing CHANGELOG entries
spastorino Aug 1, 2012
0c52702
Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."
jonleighton Aug 1, 2012
736bf14
Revert "Deprecating composed_of in ActiveRecord"
rafaelfranca Aug 1, 2012
89177ba
Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Tex…
rafaelfranca Aug 1, 2012
f203be9
revises the deprecation warning of update_attribute
fxn Aug 1, 2012
81542f9
removes the deprecation of update_attribute
fxn Aug 1, 2012
857697b
Fix CHANGELOGS
rafaelfranca Aug 1, 2012
af65b8c
Revert "Deprecate ActiveSupport::JSON::Variable"
rafaelfranca Aug 1, 2012
e826a5c
Revert "Deprecate `:mouseover` options for `image_tag` helper."
rafaelfranca Aug 1, 2012
f50a5d2
Revert "Deprecate link_to_function and button_to_function helpers"
rafaelfranca Aug 1, 2012
fcccbac
Bump to 3.2.8.rc1
spastorino Aug 1, 2012
74cf196
This entry is wrong
spastorino Aug 1, 2012
a252436
Fix ActiveSupport integration with Mocha > 0.12.1
Aug 2, 2012
5365c10
Merge pull request #7235 from ffmike/mocha_12_2_compat
carlosantoniodasilva Aug 2, 2012
f137c2b
Backport #5168 to 3-2-stable. Fix a problem that NULLS is ignored by …
kennyj Aug 1, 2012
59c4b22
Merge pull request #7232 from kennyj/fix_7200
carlosantoniodasilva Aug 2, 2012
99f622d
Do not consider the numeric attribute as changed if the old value is
rafaelfranca Aug 2, 2012
96e92b6
Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at
rafaelfranca Aug 2, 2012
5c42889
Fix ActiveSupport integration with Mocha > 0.12.1
Aug 2, 2012
55e05d4
Do not consider the numeric attribute as changed if the old value is
rafaelfranca Aug 2, 2012
9c1b1bd
Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at
rafaelfranca Aug 2, 2012
2bdb4ec
html_escape should escape single quotes
spastorino Aug 1, 2012
28f2c6f
html_escape should escape single quotes
spastorino Aug 1, 2012
2f4b82f
Fix html_escape with Ruby 1.8
rafaelfranca Aug 2, 2012
ebddf75
Fix html_escape with Ruby 1.8
rafaelfranca Aug 2, 2012
e23b26c
More `:rails_env` cleanup.
rafaelfranca Aug 2, 2012
469d885
More `:rails_env` cleanup.
rafaelfranca Aug 2, 2012
393c652
Merge pull request #6084 from brainopia/support_for_magic_domain_on_a…
josevalim Apr 30, 2012
5f9ae95
Add CHANGELOG entry
spastorino Aug 3, 2012
65b5e35
Bump to 3.2.8.rc2
spastorino Aug 3, 2012
a48ea68
Revert "Merge pull request #6084 from brainopia/support_for_magic_dom…
rafaelfranca Aug 5, 2012
0fb6bbd
Merge pull request #7140 from seamusabshere/patch-1
rafaelfranca Aug 5, 2012
8e2a05b
Do not include application.js if it doesn't exists
sikachu Aug 6, 2012
6c46730
Rearrange example output of javascript_include_tag
sikachu Aug 6, 2012
3cc872d
Merge pull request #7276 from sikachu/3-2-stable-js-include-tag-fix
rafaelfranca Aug 6, 2012
29fb31f
Merge pull request #7167 from route/missed_extend
Jul 26, 2012
a935c7a
Merge pull request #5872 from evtuhovich/prepared_statement_fix
tenderlove May 25, 2012
ea48732
Add CHANGELOG entry for a935c7a
rafaelfranca Aug 6, 2012
83e0c95
Loosen sprockets version restriction
josh Aug 7, 2012
185d74c
Merge pull request #7283 from josh/bump-sprockets
dhh Aug 7, 2012
d498b5e
make assertions easier to track down
tenderlove Aug 7, 2012
635817e
Fix invalid asset compile assertions
josh Aug 7, 2012
c35853f
Merge pull request #7284 from josh/fix-asset-tests
rafaelfranca Aug 7, 2012
4147e0f
Remove references to old behavior with headers at
rafaelfranca Aug 7, 2012
2e98e0f
Fix CHANGELOG [ci skip]
rafaelfranca Aug 8, 2012
2a6039a
Ported PR #4856 to 3-2-stable.
Aug 9, 2012
af6dfdb
Backport #7173.
Aug 9, 2012
5c2fc69
Add CHANGELOG entry
rafaelfranca Aug 9, 2012
0f9a6a7
Merge pull request #7299 from iHiD/3-2-stable-store
rafaelfranca Aug 9, 2012
6d0526d
escape select_tag :prompt values
spastorino Aug 8, 2012
e91e4e8
Do not mark strip_tags result as html_safe
spastorino Aug 8, 2012
ddedf5d
Add release date to CHANGELOGs
spastorino Aug 9, 2012
64146cf
Bump to 3.2.8
spastorino Aug 9, 2012
7987e74
Merge branch '3-2-8' into 3-2-stable
spastorino Aug 9, 2012
e8c0d73
Add html_escape note to CHANGELOG
amerine Aug 9, 2012
ae2383d
Merge pull request #7309 from amerine/3-2-stable
spastorino Aug 9, 2012
058dc9a
Revert "Revert "Merge pull request #6084 from brainopia/support_for_m…
Aug 10, 2012
bbe634e
Dont stream back cookie value if it was set to the same value
Apr 30, 2012
ca07bc0
Test actual content of permanent cookie
Aug 10, 2012
2e00074
Merge pull request #7286 from kennyj/fix_7191
rafaelfranca Aug 10, 2012
3307a2e
Add CHANGELOG entry for #7286
rafaelfranca Aug 10, 2012
dad717a
[guides] Add info about CHANGELOGs to contributing guide
drogus Aug 11, 2012
2e04a34
Update changelog to reflect support of cookie jar options for all
Aug 11, 2012
20f18cb
Merge pull request #7316 from brainopia/backport_fix_session_store_op…
rafaelfranca Aug 11, 2012
786713a
Merge pull request #6073 from daveyeu/restore-state-on-record-invalid
rafaelfranca Aug 12, 2012
bccc35b
Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redir…
jeremy Apr 12, 2012
8055cd6
Do not use update_column where update_attribute is not interchangeable
rafaelfranca Aug 15, 2012
b4dce47
Merge pull request #7027 from erichmenge/patch/jruby_send_file
carlosantoniodasilva Aug 15, 2012
4e31f82
Remove duplicated changelog entry [ci skip]
carlosantoniodasilva Aug 15, 2012
bfff0ed
Use benchmark/ips to measure AR performance
jonleighton Aug 17, 2012
25f6549
Increase benchmark time to 20 seconds.
jonleighton Aug 17, 2012
d6dbd7f
Merge pull request #7352 from aripollak/microsecond-timestamp
rafaelfranca Aug 17, 2012
3c61642
Ruby 1.8 doesn't have to_r defined to NilClass and Float.
rafaelfranca Aug 18, 2012
066ecf0
Table#remove passed an array to remove_column, which is deprecated.
jrafanie Aug 18, 2012
b3bea49
Merge pull request #7388 from ManageIQ/fix_table_remove_passing_array…
rafaelfranca Aug 18, 2012
fdf4eae
Merge pull request #7377 from brainopia/use_inversed_parent_for_first…
carlosantoniodasilva Aug 19, 2012
8905c1f
Merge pull request #6986 from kennyj/fix_6975
rafaelfranca Aug 21, 2012
c091fae
Merge pull request #7410 from sandeepravi/default_options_helper_value
rafaelfranca Aug 21, 2012
648c5a1
Merge pull request #5210 from Pliny/masteri
rafaelfranca Aug 21, 2012
015cac7
Use a model without counter cache to test read-only attributes
rafaelfranca Aug 21, 2012
d5fe242
Use Ruby 1.8 hash syntax
carlosantoniodasilva Aug 21, 2012
0ec7b35
We need to have 1-0-stable for joureny gem in edge
arunagw Aug 24, 2012
b76a963
Merge pull request #7438 from arunagw/3-2-stable-edge-rails-fix
spastorino Aug 24, 2012
4b19855
correct handling of date selects when using both disabled and discard…
nashby Aug 23, 2012
dcb2bee
Merge pull request #7446 from nashby/backport-fix-issue-7431
rafaelfranca Aug 25, 2012
8333b93
fixes a bug in dependencies.rb
fxn Aug 28, 2012
8efced6
CHANGELOGs are now per branch
fxn Aug 28, 2012
58d35f6
Ensure association preloading properly merges default scope and assoc…
lifo Aug 28, 2012
728e925
Fix bug when Rails.application is defined but is nil. See #881
marcandre May 21, 2012
f84fc39
Merge pull request #7474 from steveklabnik/backport_89ebd28
drogus Aug 29, 2012
cabab37
documents after_(commit|rollback)
fxn Aug 30, 2012
01d09a6
set the configured #inheritance_column on #become (#7503)
senny Sep 2, 2012
87ac5b4
Merge pull request #7514 from senny/issue_7503_3_2_stable
rafaelfranca Sep 3, 2012
5054e26
Merge pull request #7337 from adzap/string_to_dummy_time
rafaelfranca Sep 5, 2012
d65adc7
Update Active Model xml serialization test to reflect a change in bui…
carlosantoniodasilva Sep 7, 2012
77dd3be
Fix AR tests due to builder change with nil values / empty strings
carlosantoniodasilva Sep 7, 2012
146eaf3
Fix AS tests due to builder change with nil values / empty strings
carlosantoniodasilva Sep 7, 2012
652107e
ConnectionAdapters::Column.type_cast_code should always convert value…
thiagopradi Sep 2, 2012
924ad60
Merge pull request #7582 from tchandy/fix_type_cast_code
rafaelfranca Sep 9, 2012
9630485
Backported #7572 to 3-2-stable. Use config['encoding'], because datab…
kennyj Sep 11, 2012
f568280
Merge pull request #7603 from kennyj/fix_charset_vs_encoding_32
rafaelfranca Sep 12, 2012
f48bb01
Backport PostgreSQL auto-reconnect test coverage
Jun 7, 2012
84c7896
Merge pull request #7632 from stevecj/3-2-stable
rafaelfranca Sep 13, 2012
2326d46
fix markdown markup in AR/CHANGELOG
Sep 13, 2012
5aaf79a
Merge pull request #7633 from frodsan/patch-5
carlosantoniodasilva Sep 13, 2012
dbfdd00
`skip` in Ruby 1.8 doesn't skip the test case without return
rafaelfranca Sep 14, 2012
6abe0e7
Backport explain fixes.
rafaelfranca Sep 17, 2012
8432d03
Merge pull request #7651 from steveklabnik/issue_3956
rafaelfranca Sep 17, 2012
07c8055
Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870d…
rafaelfranca Sep 17, 2012
ee43989
Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt
rafaelfranca Sep 17, 2012
dd76b3b
log 404 status when ActiveRecord::RecordNotFound was raised (#7646)
senny Sep 16, 2012
0693e07
backport fair connection pool 02b2335563 to 3-2-stable
jrochkind Sep 17, 2012
24a7774
Merge pull request #7675 from jrochkind/fair_conn_pool_backport
rafaelfranca Sep 17, 2012
1ac19c1
Respect `config.digest = false` for `asset_path`
wagenet Sep 17, 2012
7c5454e
Merge pull request #7672 from wagenet/asset_path_digest_fix
rafaelfranca Sep 18, 2012
1929d9f
Add upgrading note to 3.1 release notes.
steveklabnik Sep 18, 2012
29ebec7
Merge pull request #7686 from steveklabnik/add_upgrade_note
rafaelfranca Sep 18, 2012
a82f1e3
Cache columns metadata to avoid extra while testing
rafaelfranca Sep 19, 2012
61d5d2d
Merge pull request #7668 from Draiken/fix_issue_6497
rafaelfranca Sep 19, 2012
c41f9c1
Load the environment after creating the database
jeremy Sep 19, 2012
4e715e3
Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and …
kennyj Sep 19, 2012
50a76c1
Merge pull request #7718 from kennyj/fix_6962-32
rafaelfranca Sep 20, 2012
e4018a0
Revert "backport fair connection pool 02b2335563 to 3-2-stable"
rafaelfranca Sep 20, 2012
54f5574
Revert "Respect `config.digest = false` for `asset_path`"
rafaelfranca Sep 20, 2012
9d07ace
Explictly set the assets digest option to false
rafaelfranca Sep 20, 2012
98f8021
Revert "Revert "Respect `config.digest = false` for `asset_path`""
rafaelfranca Sep 20, 2012
b8fba55
Merge pull request #3544 from amatsuda/_field_changed
tenderlove Feb 14, 2012
7b545ff
Merge pull request #7723 from steveklabnik/backport_3554
rafaelfranca Sep 21, 2012
114e180
Fix invalid ruby 1.8 syntax
rafaelfranca Sep 21, 2012
3908706
ConnectionPool accepts spec key 'checkout_timeout'
jrochkind Sep 21, 2012
8800aae
Merge pull request #7684 from jrochkind/connection_pool_timeout_key_b…
rafaelfranca Sep 25, 2012
08ca483
Only apply log tags if the logger supports it
jeremy Sep 24, 2012
032c2b6
Log newlines separately to ensure the 'Started GET ...' line has a ta…
jeremy Sep 26, 2012
20f5f08
Add logger.push_tags and .pop_tags to complement logger.tagged
jeremy Sep 26, 2012
35a1750
Tune up Rails::Rack::Logger. Only put space between requests in devel…
jeremy Sep 26, 2012
ddba97f
Shush syntax warnings
jeremy Sep 28, 2012
c203557
Shush uninitialized @_layout warning
jeremy Sep 28, 2012
8ca05c2
Hashrocket for 1.8 support
jeremy Sep 28, 2012
8dbf337
backport 68677ffb8298105eb9d3efa26d928dd88cc5e006
Sep 28, 2012
e1a10b1
Merge pull request #7785 from okcwest/3-2-stable
tenderlove Sep 28, 2012
c53e5de
Don't paramify ActionDispatch::Http::UploadedFile in tests
Jun 21, 2012
c2a7084
Merge pull request #7786 from yabawock/3-2-stable
rafaelfranca Sep 29, 2012
7d17cd2
Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased
rafaelfranca Sep 30, 2012
d77d4a8
New CHANGELOG entries always in the top [ci skip]
rafaelfranca Sep 30, 2012
2475882
Fix reference to code sample in Getting Started.
steveklabnik Sep 30, 2012
5cb5092
Merge pull request #7802 from steveklabnik/issue_7799
fxn Sep 30, 2012
19987b6
Asset manifest includes aliases for foo.js -> foo/index.js and vice v…
jeremy Sep 30, 2012
628e38d
Since File instance doesn't respond to #open use a double to test the
rafaelfranca Oct 1, 2012
a02f67b
Merge pull request #6450 from iHiD/resource_generator_routes_master
rafaelfranca Oct 1, 2012
3b5bc8d
Merge pull request #7789 from senny/7777_resource_functions_modify_op…
rafaelfranca Oct 1, 2012
2bad605
Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…
rafaelfranca Oct 2, 2012
3f0bc97
Merge pull request #7822 from lulalala/reset-counter-cache-for-has-ma…
rafaelfranca Oct 2, 2012
288885f
Refactor
spastorino Oct 3, 2012
36261c8
Update supported ruby versions error message in ruby_version_check.rb
lihanli Oct 3, 2012
95369a5
Merge pull request #7836 from lihanli/error-msg-update
rafaelfranca Oct 3, 2012
9896729
Merge pull request #6978 from frodsan/count_nosql_unsaved_parent
rafaelfranca Oct 4, 2012
de360ac
Merge pull request #7850 from senny/5920_postgres_adapter_table_with_…
rafaelfranca Oct 6, 2012
92d7612
Merge pull request #7848 from senny/3415_assert_template_has_nil_vari…
rafaelfranca Oct 6, 2012
380800e
Accept :remote as symbol in link_to options
teleological Oct 6, 2012
f668ab9
Use the Ruby 1.8 hash syntax
rafaelfranca Oct 6, 2012
bf07c79
Merge pull request #7865 from teleological/link_to_remote_3_2
rafaelfranca Oct 7, 2012
fb9c001
Backport 1a7049906ee6735bae058e9985a3806d08d9746b
jeremy Oct 7, 2012
de1b687
Eager autoload ActiveRecord association helpers
michaelfairley Jul 26, 2012
2bed954
Eager autoload Preloader classes
jfirebaugh Oct 10, 2012
eefb344
Merge pull request #7905 from jfirebaugh/eager_autoload_3-2
rafaelfranca Oct 11, 2012
990a938
Fix has_many assocation w/select load after create
ernie Oct 5, 2012
84c3774
Merge pull request #7925 from ernie/3-2-fix-collection-associations-w…
rafaelfranca Oct 12, 2012
3980465
#7914 get default value when type uses schema name
arturopie Oct 14, 2012
3006c59
7914 Using a better way to get the defaults from db.
arturopie Oct 14, 2012
b3485b7
Merge pull request #7940 from arturopie/7914-backport-to-3-2-stable
rafaelfranca Oct 14, 2012
d92e66f
Synchronize around deleting from the reserved connections hash.
tenderlove Oct 15, 2012
9a38e73
Merge pull request #7371 from csmuc/fix_dup_validation_errors
spastorino Oct 16, 2012
f4ddc49
Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951
Oct 18, 2012
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 5 additions & 3 deletions Gemfile
Expand Up @@ -14,15 +14,15 @@ gem 'jquery-rails'
if ENV['JOURNEY']
gem 'journey', :path => ENV['JOURNEY']
else
gem 'journey'
gem 'journey', :git => 'git://github.com/rails/journey.git', :branch => '1-0-stable'
end

# This needs to be with require false to avoid
# it being automatically loaded by sprockets
gem 'uglifier', '>= 1.0.3', :require => false

gem 'rake', '>= 0.8.7'
gem 'mocha', '>= 0.9.8'
gem 'mocha', '>= 0.12.1'

group :doc do
# The current sdoc cannot generate GitHub links due
Expand All @@ -47,7 +47,7 @@ instance_eval File.read '.Gemfile' if File.exists? '.Gemfile'

platforms :mri do
group :test do
gem 'ruby-prof' if RUBY_VERSION < '1.9.3'
gem 'ruby-prof', '~> 0.11.2'
end
end

Expand Down Expand Up @@ -95,3 +95,5 @@ end

# A gem necessary for ActiveRecord tests with IBM DB
gem 'ibm_db' if ENV['IBM_DB']

gem 'benchmark-ips'
2 changes: 1 addition & 1 deletion RAILS_VERSION
@@ -1 +1 @@
3.2.0.rc1
3.2.8
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -94,7 +94,7 @@ RDoc::Task.new do |rdoc|

rdoc.options << '-f' << 'sdoc'
rdoc.options << '-T' << 'rails'
rdoc.options << '-c' << 'utf-8'
rdoc.options << '-e' << 'UTF-8'
rdoc.options << '-g' # SDoc flag, link methods to GitHub
rdoc.options << '-m' << RDOC_MAIN

Expand Down