aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix ActiveRecord#update_column return valuesaksmlz2012-10-312-1/+7
|
* Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased"Rafael Mendonça França2012-10-314-37/+14
| | | | | | | | | | | | | This reverts commit 7d17cd2cbfc086f5aa9dd636e1207eb130150428. Conflicts: actionpack/CHANGELOG.md Reason: This added a regression since people were relying on this buggy behavior. This will introduce back #3849 but we will be backward compatible in stable release. Fixes #8068.
* Revert "Merge pull request #7797 from ↵Rafael Mendonça França2012-10-303-23/+31
| | | | | | | | | | | | | | | | | senny/7459_prefix_tempalte_assertion_variables" This reverts commit 2bad605873b5b720d77ae6388a995827ab7fe705. Conflicts: actionpack/CHANGELOG.md Reason: This added a regression related with shoulda-matchers, since it is expecting the instance variable @layouts See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74 This will introduce back #7459 but this stable release will be backward compatible. Related with #8068.
* Add CHANGELOG entry to #8032 fixRafael Mendonça França2012-10-291-0/+5
| | | | | | e6b41845efe2252fe7de6882e355c31f93c65cc3 fixes that issue too. [ci skip]
* Fix typo :bomb: [ci skip]Rafael Mendonça França2012-10-291-1/+1
|
* Fix bug when Column is trying to type cast boolean values to integer.Rafael Mendonça França2012-10-293-6/+22
| | | | | | | | This can occur if the user is using :integer columns to store boolean values. Now we are handling the boolean values but it still raises if the value can't type cast to integer and is not a boolean. See #7509. Fixes #8067.
* Merge pull request #8009 from graceliu/3-2-fix_database_url_supportRafael Mendonça França2012-10-296-37/+287
|\ | | | | | | fixed support for DATABASE_URL for rake db tasks
| * fixed support for DATABASE_URL for rake db tasksGrace Liu2012-10-296-37/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport for #7521 - added tests to confirm establish_connection uses DATABASE_URL and Rails.env correctly even when no arguments are passed in. - updated rake db tasks to support DATABASE_URL, and added tests to confirm correct behavior for these rake tasks. (Removed establish_connection call from some tasks since in those cases the :environment task already made sure the function would be called) - updated Resolver so that when it resolves the database url, it removes hash values with empty strings from the config spec (e.g. to support connection to postgresql when no username is specified). - updated ResolverTest to use current_adapter? to check the type of the current adapter.
* | Bump to 3.2.9.rc1Santiago Pastorino2012-10-299-17/+17
|/
* Add 3.2.9 section in ARes CHANGELOGSantiago Pastorino2012-10-291-0/+4
| | | | [ci skip]
* Revert "Deprecate Paths::Path#children which is unused now"Rafael Mendonça França2012-10-291-1/+0
| | | | | | | This reverts commit f7de647f2cd099ecf6434fa4a0db1ec297f1c32d. We can't deprecate things in stable branches. I didn't not realized that the pull request was for 3-2-stable
* Merge pull request #7587 from elia/fix-too-eager-loadingRafael Mendonça França2012-10-293-6/+17
|\ | | | | Should not eager_load app/assets
| * Deprecate Paths::Path#children which is unused nowElia Schito2012-10-291-0/+1
| |
| * Respect children paths filter settingsElia Schito2012-10-282-6/+13
| | | | | | | | E.g. don't eager-load app/assets even if app/* has the eager_load flag set.
| * Add test case to assets eager loadRafael Mendonça França2012-10-271-0/+3
| |
* | Merge pull request #8057 from frodsan/fix_sqlite_mutate_argRafael Mendonça França2012-10-292-1/+9
| | | | | | | | | | | | SQLite3Adapter#type_cast should not mutate arguments Conflicts: activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
* | Merge pull request #8053 from henrik/update_columns_with_primary_keyCarlos Antonio da Silva2012-10-293-1/+17
| | | | | | | | | | | | | | | | Unbreak update_column/update_columns for the primary key attribute. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/persistence.rb activerecord/test/cases/persistence_test.rb
* | Make Active Record tests pass in isolationRafael Mendonça França2012-10-292-3/+2
| | | | | | | | Also remove the feature detecting for Ruby 1.9
* | Fix the skip code.Rafael Mendonça França2012-10-281-4/+4
| | | | | | | | Checking for the constant doesn't work
* | Merge pull request #7593 from veader/patch-1Rafael Mendonça França2012-10-283-0/+14
| | | | | | | | | | | | | | Decode attributes pulled from URI.parse Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/connection_specification.rb
* | Merge pull request #8048 from senny/7761_dont_render_view_without_mail_callRafael Mendonça França2012-10-285-1/+34
| | | | | | | | | | | | Do not render views when mail() isn't called. (NullMail refactoring) Conflicts: actionmailer/CHANGELOG.md
* | Merge pull request #8047 from arunagw/json_only_in_18Carlos Antonio da Silva2012-10-281-1/+0
|\ \ | | | | | | Removing JSON for other ruby
| * | Removing JSON for other rubyArun Agrawal2012-10-281-1/+0
|/ / | | | | | | | | | | | | It's only required for 1.8 and for JRuby! I was fixing a bug with JSON pure on 1.8.7 and I found that we have included json for other 1.8 > rubies also.
* / Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependencyJeremy Kemper2012-10-274-5/+6
|/ | | | Fix AM::Serializers::Xml dependency
* Merge pull request #8022 from GRoguelon/3-2-stableRafael Mendonça França2012-10-241-1/+1
|\ | | | | Adding a missing parenthesis in the doc of String#parameterize.
| * Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-1/+1
| |
* | frozen state should be restored after txn is abortedAaron Patterson2012-10-222-2/+18
| |
* | Merge pull request #7986 from Grandrath/patch-2Carlos Antonio da Silva2012-10-201-1/+1
|\ \ | | | | | | Fix behavior of `rake db:structure:load` for 3.2.8
| * | Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951Martin Grandrath2012-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | `ENV['RAILS_ENV']` is not defined unless explicitly specified on the command line when running `rake db:structure:load`. This patch lets the rake task retrieve the environment from `Rails.env` which defaults to "development".
* | | Require ActionController::Railtie in the default middleware stack.Rafael Mendonça França2012-10-181-0/+2
| | | | | | | | | | | | | | | This will make possible to do a frameworkless initialization since the the default middleware stack is self contained.
* | | Merge pull request #7989 from senny/backport_7969Rafael Mendonça França2012-10-181-0/+1
|\ \ \ | |/ / |/| | backport: active_model/validations requires necessary files to run
| * | active_model/validations requires necessary files to runYves Senn2012-10-181-0/+1
|/ /
* | Merge pull request #7371 from csmuc/fix_dup_validation_errorsSantiago Pastorino2012-10-173-0/+21
| | | | | | | | | | | | | | Dup'ed ActiveRecord objects may not share the errors object Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/dup_test.rb
* | Synchronize around deleting from the reserved connections hash.Aaron Patterson2012-10-152-1/+4
| | | | | | | | Fixes #7955
* | Merge pull request #7940 from arturopie/7914-backport-to-3-2-stableRafael Mendonça França2012-10-144-14/+61
|\ \ | | | | | | Backport fix of issue #7914 to 3-2-stable
| * | 7914 Using a better way to get the defaults from db.Arturo Pie2012-10-141-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: * According to postgreSQL documentation: (http://www.postgresql.org/docs/8.2/static/catalog-pg-attrdef.html) we should not be using 'adsrc' field because this field is unaware of outside changes that could affect the way that default values are represented. Thus, I changed the queries to use "pg_get_expr(adbin, adrelid)" instead of the historical "adsrc" field. * Remove parsing of character type default values for 8.1 formatting since Rails doesn't support postgreSQL 8.1 anymore. * Remove misleading comment unrelated to code.
| * | #7914 get default value when type uses schema nameArturo Pie2012-10-144-2/+54
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL adapter properly parses default values when using multiple schemas and domains. When using domains across schemas, PostgresSQL prefixes the type of the default value with the name of the schema where that type (or domain) is. For example, this query: ``` SELECT a.attname, d.adsrc FROM pg_attribute a LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum WHERE a.attrelid = "defaults"'::regclass AND a.attnum > 0 AND NOT a.attisdropped ORDER BY a.attnum; ``` could return something like "'<default_value>'::pg_catalog.text" or "(''<default_value>'::pg_catalog.text)::text" for the text columns with defaults. I modified the regexp used to parse this value so that it ignores anything between ':: and \b(?:character varying|bpchar|text), and it allows to have optional parens like in the above second example.
* | Merge pull request #7925 from ernie/3-2-fix-collection-associations-with-selectRafael Mendonça França2012-10-123-1/+15
|\ \ | | | | | | Fix has_many assocation w/select load after create
| * | Fix has_many assocation w/select load after createErnie Miller2012-10-123-1/+15
|/ / | | | | | | | | | | | | | | | | | | If you create a new record via a collection association proxy that has not loaded its target, and which selects additional attributes through the association, then when the proxy loads its target, it will inadvertently trigger a deprecation notice during attribute writing when CollectionAssociation#merge_target_lists attempts to do its thing, since the newly loaded records will possess attributes the created record does not.
* | Merge pull request #7905 from jfirebaugh/eager_autoload_3-2Rafael Mendonça França2012-10-102-15/+21
|\ \ | | | | | | Backport eager autoloading fixes
| * | Eager autoload Preloader classesJohn Firebaugh2012-10-101-10/+14
| | | | | | | | | | | | | | | | | | Without eager autoloading, these would be autoloaded only when #preloader_for is called, which is too late in threaded applications.
| * | Eager autoload ActiveRecord association helpersMichael Fairley2012-10-101-5/+7
|/ /
* | Backport 1a7049906ee6735bae058e9985a3806d08d9746bJeremy Kemper2012-10-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log | grep -v assets
* | Merge pull request #7865 from teleological/link_to_remote_3_2Rafael Mendonça França2012-10-063-1/+12
|\ \ | | | | | | Accept :remote as symbol in link_to options (backport)
| * | Accept :remote as symbol in link_to optionsRiley2012-10-063-1/+12
| | | | | | | | | | | | | | | Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to.
* | | Use the Ruby 1.8 hash syntaxRafael Mendonça França2012-10-061-1/+1
|/ /
* | Merge pull request #7848 from senny/3415_assert_template_has_nil_variableRafael Mendonça França2012-10-063-3/+23
| | | | | | | | | | | | can't pass :locals to #assert_template without a view test case (#3415) Conflicts: actionpack/CHANGELOG.md
* | Merge pull request #7850 from ↵Rafael Mendonça França2012-10-063-5/+14
| | | | | | | | | | | | | | | | | | senny/5920_postgres_adapter_table_with_capital_letters postgres, quote table names when fetching the primary key (#5920) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
* | Merge pull request #6978 from frodsan/count_nosql_unsaved_parentRafael Mendonça França2012-10-045-0/+37
| | | | | | | | Count returns 0 without querying if parent is not saved
* | Merge pull request #7836 from lihanli/error-msg-updateRafael Mendonça França2012-10-032-2/+6
|\ \ | | | | | | Update supported ruby versions error message in ruby_version_check.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:30:23 +0000