Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #7161 from ↵ | Jon Leighton | 2012-07-26 | 1 | -5/+7 | |
|\ \ \ | |/ / |/| | | | | | | | | michaelfairley/eager_load_active_record_association_helpers Eager autoload ActiveRecord association helpers | |||||
| * | | Eager autoload ActiveRecord association helpers | Michael Fairley | 2012-07-25 | 1 | -5/+7 | |
| | | | ||||||
* | | | Merge pull request #7165 from parndt/patch-5 | Rafael Mendonça França | 2012-07-25 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Switched update_column recommendation in changelog to update_columns | |||||
| * | | | Switched update_column recommendation in changelog to update_columns | Philip Arndt | 2012-07-26 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | | | | Related to #7164 Looks like the last one; thanks! | |||||
* | | | Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2 | Aaron Patterson | 2012-07-25 | 3 | -1/+76 | |
|\ \ \ | | | | | | | | | Postgresql auto reconnect 2 | |||||
| * | | | Stop being silly with formatting of method aliasing. | Steve Jorgensen | 2012-07-16 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. | Steve Jorgensen | 2012-07-16 | 3 | -0/+75 | |
| | | | | ||||||
| * | | | Don't crash exception translation w/ nil result attribute. | Steve Jorgensen | 2012-07-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Exception.result is nil when attempting a query after PostgreSQL disconnect, resulting in new exception: NoMethodError: undefined method `error_field' for nil:NilClass | |||||
* | | | | Merge pull request #7158 from yahonda/use_string_for_settings | Rafael Mendonça França | 2012-07-25 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Use string datatype for the setting attribute | |||||
| * | | | | Use string datatype for the setting attribute | Yasuo Honda | 2012-07-26 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | to make store works all database adapters. | |||||
* | | | | Merge pull request #7151 from graceliu/travis-rm-dup-run | Carlos Antonio da Silva | 2012-07-24 | 1 | -3/+0 | |
|\ \ \ \ | | | | | | | | | | | remove duplicate build runs in travis | |||||
| * | | | | remove duplicate build runs in travis. These extra runs were used to | Grace Liu | 2012-07-24 | 1 | -3/+0 | |
|/ / / / | | | | | | | | | | | | | test identity map and not fully removed when the feature was removed. | |||||
* | | | | Merge branch 'update_columns' | Rafael Mendonça França | 2012-07-24 | 16 | -63/+212 | |
|\ \ \ \ | ||||||
| * | | | | Deprecate update_column in favor of update_columns. | Rafael Mendonça França | 2012-07-24 | 15 | -47/+85 | |
| | | | | | | | | | | | | | | | | | | | | Closes #1190 | |||||
| * | | | | Use update_columns to implemente the update_column | Rafael Mendonça França | 2012-07-24 | 2 | -19/+54 | |
| | | | | | ||||||
| * | | | | New #update_columns method. | Sebastian Martinez | 2012-07-24 | 3 | -0/+76 | |
|/ / / / | ||||||
* | | | | Merge pull request #7148 from yahonda/address_6195 | Rafael Mendonça França | 2012-07-24 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Addresses ORA-01400 errors and also supports #6115 | |||||
| * | | | | This pull requests addresses ORA-01400 errors and also supports #6115 issue ↵ | Yasuo Honda | 2012-07-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tested. Issue #6115 has been fixed and tested with the attribute `:null => false, :default => ""` However `:null => false` attribute is not necessary to test this issue, which causes many ORA-01400 errors with Oracle enhanced adapter. | |||||
* | | | | | Merge pull request #7150 from lucasmazza/flush_option | Rafael Mendonça França | 2012-07-24 | 2 | -13/+13 | |
|\ \ \ \ \ | | | | | | | | | | | | | Replace the flush parameter with a Hash. | |||||
| * | | | | | Replace the flush parameter with a Hash. | Lucas Mazza | 2012-07-24 | 2 | -13/+13 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #6991 from frodsan/performance_test_generator | Rafael Mendonça França | 2012-07-24 | 2 | -2/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | update performance test template to use test method | |||||
| * | | | | update performance test template to use test method | Francesco Rodriguez | 2012-07-06 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #7143 from accessd/fix-typo-callbacks-test | Santiago Pastorino | 2012-07-24 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | fix typo in validations callbacks test | |||||
| * | | | | | fix typo in callbacks test | Accessd | 2012-07-24 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Add CHANGELOG entry | Santiago Pastorino | 2012-07-23 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | Remove ActionDispatch::Head middleware in favor of Rack::Head | Santiago Pastorino | 2012-07-23 | 7 | -32/+12 | |
| | | | | | | | | | | | | | | | | | | | | Closes #7110 there's more work to do on rack-cache issue 69 | |||||
* | | | | | Merge pull request #7137 from kennyj/fix_installing_problem_journey | Rafael Mendonça França | 2012-07-23 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix build. There is journey-1.0.4 on the 1-0-stable branch. | |||||
| * | | | | | Fix build. Bump Journey requirements to 2.0.0. | kennyj | 2012-07-24 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Bump Journey requirements to 1.0.4 | Andrew White | 2012-07-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | Add one more test case to make sure that data attributes are being | Rafael Mendonça França | 2012-07-22 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | escaped | |||||
* | | | | | Merge pull request #7130 from kennyj/fix_restoring_query_cache | Rafael Mendonça França | 2012-07-22 | 2 | -4/+22 | |
|\ \ \ \ \ | | | | | | | | | | | | | Restore connection_id on error. | |||||
| * | | | | | Restore connection_id on error. | kennyj | 2012-07-23 | 2 | -4/+22 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #7123 from nashby/data-in-options | Rafael Mendonça França | 2012-07-22 | 2 | -8/+15 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | don't escape options in option_html_attributes method | |||||
| * | | | | | don't escape options in option_html_attributes method | Vasiliy Ermolovich | 2012-07-22 | 2 | -8/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't need to escape values in this method as we pass these html attributes to `tag_options` method that handle escaping as well. it fixes the case when we want to pass html5 data options | |||||
* | | | | | | Merge pull request #7126 from frodsan/fix_nodoc_encoding | Rafael Mendonça França | 2012-07-21 | 1 | -15/+48 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fixing :nodoc:s in AS::JSON::Encoding | |||||
| * | | | | | | fixing :nodoc:s in AS::JSON::Encoding | Francesco Rodriguez | 2012-07-21 | 1 | -15/+48 | |
|/ / / / / / | ||||||
* | | | | | | Remove deprecation warnings | Carlos Galdino + Rafael Mendonça França | 2012-07-21 | 2 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Add back `:disable_with` and change deprecation horizon to 4.1 | Carlos Galdino + Rafael Mendonça França | 2012-07-21 | 5 | -5/+74 | |
| | | | | | | ||||||
* | | | | | | Add back `:confirm` and change deprecation horizon to 4.1 | Carlos Galdino + Rafael Mendonça França | 2012-07-21 | 5 | -2/+144 | |
| | | | | | | ||||||
* | | | | | | +"foo"+ doesn't generate code tag [ci skip] | Rafael Mendonça França | 2012-07-21 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Lets be consistent with whitespaces at documentation | Rafael Mendonça França | 2012-07-21 | 1 | -13/+13 | |
| | | | | | | ||||||
* | | | | | | Copy-edits at Rails::Queueing documentation | Rafael Mendonça França | 2012-07-21 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | update 4.0 release notes [ci skip] | Vijay Dev | 2012-07-21 | 1 | -0/+2 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-07-21 | 7 | -27/+108 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | improve NullRelation docs [ci skip] | Vijay Dev | 2012-07-21 | 2 | -5/+4 | |
| | | | | | | | ||||||
| * | | | | | | minor copy edits [ci skip] | Vijay Dev | 2012-07-21 | 2 | -4/+2 | |
| | | | | | | | ||||||
| * | | | | | | Revert "Make it clear that you can also pass a full url to assert_routing." | Vijay Dev | 2012-07-21 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5a6f30ff0f11f6d685d2601a60700784e3555b8b. | |||||
| * | | | | | | Revert "Fix a reference" | Xavier Noria | 2012-07-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sentence itself was not exact, [] and fetch are different. Reverting in docrails because it has been reworded in master and 3-2-stable,see 98f4aee8dac22d9e9bb3c122b43e9e5ee8ba7d1c. This reverts commit 69879667dcf4494915f1b9d826f17856bff11887. | |||||
| * | | | | | | Make it clear that you can also pass a full url to assert_routing. | Sytse Sijbrandij | 2012-07-20 | 1 | -0/+3 | |
| | | | | | | | ||||||
| * | | | | | | Fix typos | Oscar Del Ben | 2012-07-19 | 1 | -3/+3 | |
| | | | | | | |