aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Unused class in AV testAkira Matsuda2013-12-251-2/+0
|
* Revert "Ensure secret_key_base is set for all environments"José Valim2013-12-241-2/+1
| | | | | | A better solution has been pushed to master. This reverts commit 959cfcef7255bba720ce3f15323056533ea7b50a.
* Merge pull request #13472 from schneems/schneems/fix-master-database-url-testsJosé Valim2013-12-241-1/+2
|\ | | | | Fix railties tests in master
| * Fix railties tests in masterschneems2013-12-241-1/+2
| | | | | | | | | | Tests are failing due to missing env var on master https://travis-ci.org/rails/rails/jobs/15930622#L641 This adds an environment variable `ENV['RAILS_SECRET_KEY_BASE']` so these tests will pass.
* | Merge pull request #13471 from schneems/schneems/better-secrets-error-messageJosé Valim2013-12-241-1/+1
|\ \ | | | | | | Better missing `secret_key_base` error message
| * | Better missing `secret_key_base` error messageschneems2013-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the error was: ``` RuntimeError: You must set secret_key_base in your app's config ``` Will now be: ``` RuntimeError: Missing `secret_key_base` for 'production' environment, set this value in `config/secrets.yml` ```
* | | Merge pull request #13469 from schneems/schneems/no-database-errors-allJosé Valim2013-12-246-2/+41
|\ \ \ | |_|/ |/| | Raise NoDatabaseError when db does not exist
| * | Raise NoDatabaseError when db does not existschneems2013-12-246-2/+41
| | | | | | | | | Building on the work of #13427 this PR adds a helpful error message to the adapters: mysql, mysql2, and sqlite3
* | | Ensure secret_key_base is set for all environmentsJosé Valim2013-12-241-1/+2
|/ /
* | Merge pull request #13467 from JuanitoFatas/getting-startedArun Agrawal2013-12-241-1/+1
|\ \ | | | | | | [ci skip] Update getting started Ruby version.
| * | [ci skip] Update getting started Ruby version.Juanito Fatas2013-12-241-1/+1
|/ /
* | Deprecate use of string in establish_connection as connection lookupJosé Valim2013-12-247-15/+33
| |
* | Only build a ConnectionSpecification if requiredJosé Valim2013-12-246-60/+60
| |
* | Fix build failures related to the new ENV options in ymlJosé Valim2013-12-243-4/+22
| |
* | Unused classes in AV testsAkira Matsuda2013-12-243-18/+0
| |
* | AC::Parameters#permit! permits hashes in array valuesXavier Noria2013-12-233-5/+19
| |
* | Merge pull request #13463 from josevalim/jv-envJosé Valim2013-12-2320-96/+113
|\ \ | | | | | | Do not store production information in .yml files
| * | Update CHANGELOG [ci skip]José Valim2013-12-231-0/+5
| | |
| * | Use the new Resolver API in dbconsoleJosé Valim2013-12-231-3/+2
| | |
| * | Add examples and namespace ENV options with "RAILS_"José Valim2013-12-2312-13/+25
| | |
| * | Guarantee the connection resolver handles string valuesJosé Valim2013-12-236-53/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also cleans up the rake tasks that were checking for DATABASE_URL in different places. In fact, it would be nice to deprecate DATABASE_URL usage in the long term, considering the direction we are moving of allowing those in .yml files.
| * | Do not store production information in .yml filesJosé Valim2013-12-2312-40/+36
| |/ | | | | | | Instead, read information from environment variables.
* | Disable locale checks to avoid warnings in Active Model tests [ci skip]Carlos Antonio da Silva2013-12-231-0/+3
| | | | | | | | | | Missed AMo when adding to the other components in ae196e85ee7169700afac2eecdc276bc06b10b8d.
* | Tidy up fix for PG extensions quotingCarlos Antonio da Silva2013-12-235-12/+26
| | | | | | | | | | Always pass in the column for quote_bound_value and quote using it in case it exists there.
* | Serialize postgres' hstore, json and array types correctly in AR update methods.Tadas Tamosauskas2013-12-235-4/+30
| | | | | | | | | | | | | | | | | | Fixes #12261. Closes #12395. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/adapters/postgresql/array_test.rb activerecord/test/cases/adapters/postgresql/json_test.rb
* | Do not consider PG array columns as number or text columnsCarlos Antonio da Silva2013-12-233-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code uses these checks in several places to know what to do with a particular column, for instance AR attribute query methods has a branch like this: if column.number? !value.zero? end This should never be true for array columns, since it would be the same as running [].zero?, which results in a NoMethodError exception. Fixing this by ensuring that array columns in PostgreSQL never return true for number?/text? checks. Since most of the array support was based on the postgres_ext lib, it's worth noting it does the same thing for numeric array columns too: https://github.com/dockyard/postgres_ext/blob/v1.0.0/lib/postgres_ext/active_record/connection_adapters/postgres_adapter.rb#L72 This extended the same logic for text columns to ensure consistency.
* | Move the null mime type to request.formatCarlos Antonio da Silva2013-12-236-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TLDR: always return an object that responds to the query methods from request.format, and do not touch Mime::Type[] lookup to avoid bugs. --- Long version: The initial issue was about being able to do checks like request.format.html? for request with an unknown format, where request.format would be nil. This is where the issue came from at first in #7837 and #8085 (merged in cba05887dc3b56a46a9fe2779b6b228880b49622), but the implementation went down the path of adding this to the mime type lookup logic. This unfortunately introduced subtle bugs, for instance in the merged commit a test related to send_file had to be changed to accomodate the introduction of the NullType. Later another bug was found in #13064, related to the content-type being shown as #<Mime::NullType:...> for templates with localized extensions but no format included. This one was fixed in #13133, merged in 43962d6ec50f918c9970bd3cd4b6ee5c7f7426ed. Besides that, custom handlers were not receiving the proper template formats anymore when passing through the rendering process, because of the NullType addition. That was found while migrating an application from 3.2 to 4.0 that uses the Markerb gem (a custom handler that generates both text and html emails from a markdown template). --- This changes the implementation moving away from returning this null object from the mime lookup, and still fixes the initial issue where request.format.zomg? would raise an exception for unknown formats due to request.format being nil.
* | Merge pull request #13462 from JuanitoFatas/getting-startedGodfrey Chan2013-12-231-3/+3
|\ \ | |/ |/| [ci skip] a destroy action in controller, not delete [getting_stated.md].
| * [ci skip] a destroy action in controller, not delete [getting_stated.md].Juanito Fatas2013-12-241-3/+3
|/
* Merge pull request #13427 from schneems/schneems/cannot-connect-postgres-errorYves Senn2013-12-235-0/+40
|\ | | | | Tell how to Create a Database in Error Message
| * Tell how to Create a Database in Error Messageschneems2013-12-235-0/+40
|/ | | | | | | | | | | | | | | | Currently if you attempt to use a database that does not exist you get an error: ``` PG::ConnectionBad FATAL: database "db_error" does not exist ``` The solution is easy, create and migrate your database however new developers may not know these commands by memory. Instead of requiring the developer to search for a solution, tell them how to fix the problem in the error message: ``` ActiveRecord::NoDatabase: FATAL: database "db_error" does not exist Run `$ bin/rake db:create db:migrate` to create your database ``` Active Record should not know about `rake db:migrate` so this additional information needs to come from the railtie. Potential alternative implementation suggestions are welcome.
* Fix comment example in AR enum [ci skip]Carlos Antonio da Silva2013-12-231-1/+1
|
* Merge pull request #13455 from jetthoughts/13445_fix_touch_destroyed_recordYves Senn2013-12-233-1/+22
|\ | | | | On destroying do not touch destroyed belongs to association.
| * On destroying do not touch destroyed belongs to association.Paul Nikitochkin2013-12-233-1/+22
|/ | | | Fixes: #13445
* Merge pull request #13446 from kuldeepaggarwal/resolver-test-casesYves Senn2013-12-231-0/+10
|\ | | | | Resolver test cases
| * added test cases for Resolver#connection_url_to_hashKuldeep Aggarwal2013-12-231-0/+10
| |
* | Merge pull request #13457 from strzalek/add-missing-av-railtieJosé Valim2013-12-231-0/+1
|\ \ | | | | | | Add missing av/railtie require
| * | Add missing av/railtie requireŁukasz Strzałkowski2013-12-221-0/+1
|/ /
* | CHANGELOG entry for #13451. [ci skip]Yves Senn2013-12-221-0/+13
| |
* | Merge pull request #13451 from dmathieu/quoting_non_stringsYves Senn2013-12-222-1/+7
|\ \ | | | | | | Fix typecasting array of integers
| * | fix quoting non-stringsDamien Mathieu2013-12-222-1/+7
|/ / | | | | | | Closes #13444
* | Use the same enum definition in the docs and in the comments [ci skip]Godfrey Chan2013-12-221-6/+6
| |
* | Add comments with urls for email previewsAndrew White2013-12-222-6/+13
|/
* Merge pull request #13443 from schneems/schneems/fix-master-testsGuillermo Iguaran2013-12-213-24/+26
|\ | | | | Fix DB Console tests
| * Use Full path to sqlite database in testsschneems2013-12-222-4/+4
| |
| * Fix DB Console tests schneems2013-12-211-20/+22
|/ | | | | | | | | | | The build is broken: https://travis-ci.org/rails/rails/builds/15824530 This commit fixes it. The problem: Sqlite expects the `database` part to be an absolute path. That prompted this change to be committed to master: https://github.com/rails/rails/commit/fbb79b517f3127ba620fedd01849f9628b78d6ce This change provides correct behavior. Unfortunately tests were introduced in https://github.com/rails/rails/commit/971d5107cd4cd08c22a85d34546f4ba03ed5c925 that were relying on the incorrect behavior. We can avoid the fix by changing to another database url such as `mysql` or `postgresql` In addition to fixing the failure, the assertions are changed so that the "expected" value comes before "actual" value.
* Merge pull request #13438 from vipulnsward/enable-memache-on-travisGuillermo Iguaran2013-12-211-0/+3
|\ | | | | Enable memcached service on travis for running cache tests.
| * Enable memcached service on travis for running cache tests.Vipul A M2013-12-221-0/+3
| |
* | Merge pull request #13436 from robin850/patch-11Guillermo Iguaran2013-12-214-2/+18
|\ \ | | | | | | Add missing changelog entries and fix few typos
| * | Fix few typos in the documentation [ci skip]Robin Dupret2013-12-212-2/+2
| | |