aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Improve font of some code in API documentation [ci skip]Chun-wei Kuo2013-12-265-30/+31
|/ / / / / | | | | | | | | | | | | | | | | | | | | * Add "<tt>" or "+" to improve font of some code and filenames in API documentation * Does not contain wording changes
* | | | | Merge pull request #13442 from aditya-kapoor/update-docsGodfrey Chan2013-12-261-16/+11
|\ \ \ \ \ | | | | | | | | | | | | Updated documentation for Attribute Methods [ci skip]
| * | | | | Added Backslashes to ActiveModel::AttributeMethods to prevent unwanted links ↵aditya-kapoor2013-12-251-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | in the rdoc + some other doc fixes.[ci skip]
* | | | | | Merge pull request #13485 from schneems/schneems/fix-more-railties-testsGuillermo Iguaran2013-12-252-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Partial fix of database url tests
| * | | | | | Fix failure introduced from #13488schneems2013-12-251-1/+1
| | | | | | |
| * | | | | | fix 2.1.0 bug :(schneems2013-12-251-1/+1
| | | | | | |
| * | | | | | ensure environment is run before db:structure:loadschneems2013-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now `db:drop` depends on `load_config` since so when `db:drop` gets executed `load_config` gets run. `db:structure:load` depends on `[:environment, :load_config]`. So before it runs, it executes `environment` but because `load_config` has already executed it is skipped. Note `db:load_config` is "invoke"-d twice, but only "execute"-d once: ``` ** Invoke db:drop (first_time) ** Invoke db:load_config (first_time) ** Execute db:load_config ** Execute db:drop ** Invoke db:structure:load (first_time) ** Invoke environment (first_time) ** Execute environment ** Invoke db:load_config ** Execute db:structure:load ``` The fix for this is making sure that the environment is run before any `load_config`: ``` ** Invoke environment (first_time) ** Execute environment ** Invoke db:drop (first_time) ** Invoke db:load_config (first_time) ** Execute db:load_config ** Execute db:drop ** Invoke db:structure:load (first_time) ** Invoke environment ** Invoke db:load_config ** Execute db:structure:load ```
| * | | | | | Partial fix of database url testsschneems2013-12-251-1/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to #13463 when `DATABASE_URL` was set, Rails automagically used that value instead of the database.yml. There are tests in dbs_test that expect this to still be true. After that PR, `RAILS_DATABASE_URL` is expected to be read into the YAML file via ERB, this PR fixes that behavior. Note: this does not entirely fix the tests. It seems that `ActiveRecord::Tasks::DatabaseTasks.current_config` does not process the url string correctly (convert it into a hash), and ` ActiveRecord::Tasks::DatabaseTasks.structure_load(current_config, filename)` as well as other methods in `DatabaseTasks` expect a hash. It seems like we should involve the resolver somewhere in this process to correctly convert the database url, I do not know the best place for that /cc @josevalim
* | | | | | Fix tests names: tokens.yml => secrets.ymlGuillermo Iguaran2013-12-251-2/+2
| | | | | |
* | | | | | Merge pull request #13488 from strzalek/fix-railties-warningsGuillermo Iguaran2013-12-252-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix railties warnings
| * | | | | | Cast env to symbol, fixes deprecation warningŁukasz Strzałkowski2013-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning: DEPRECATION WARNING: Passing a string to ActiveRecord::Base.establish_connection for a configuration lookup is deprecated, please pass a symbol (:development) instead.
| * | | | | | Avoid getting redefined method warningŁukasz Strzałkowski2013-12-251-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning: ~/projects/rails/activerecord/lib/active_record/railtie.rb:140: warning: method redefined; discarding old extend_message ~/projects/rails/activerecord/lib/active_record/errors.rb:104: warning: previous definition of extend_message was here
* | | | | | Merge pull request #13478 from schneems/schneems/fix-mysqlGuillermo Iguaran2013-12-252-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move mysql2 test for when adapter will be loaded
| * | | | | | Move mysql2 test for when adapter will be loadedschneems2013-12-242-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When run with only the Mysql adapter, we get this failure: https://travis-ci.org/rails/rails/jobs/15937907#L2416 Porting the test over to only run when mysql2 is loaded
* | | | | | | Test with 2.1.0Guillermo Iguaran2013-12-251-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #13482 from aayushkhandelwal11/typoArun Agrawal2013-12-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Typo rectified commom => common[ci skip]
| * | | | | | Typo rectified commom => common[ci skip]Aayush khandelwal2013-12-251-1/+1
| | | | | | |
* | | | | | | Merge pull request #13480 from kuldeepaggarwal/f-removed-depricated-configJosé Valim2013-12-252-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | using symbol instead of string in establish_connection
| * | | | | | | using symbol instead of string in establish_connectionKuldeep Aggarwal2013-12-252-2/+2
| | | | | | | |
* | | | | | | | Unused classes in AP testsAkira Matsuda2013-12-252-14/+0
|/ / / / / / /
* | / / / / / 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 09:03:06 +0000