aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #13514 from kuldeepaggarwal/f-removed-warningsYves Senn2013-12-281-1/+1
|\ \ \ \ | | | | | | | | | | Removed warnings: setting `changed_attributes` instance variable if it is already initialized.
| * | | | setting `changed_attributes` instance variable if it is already initialized.Kuldeep Aggarwal2013-12-281-1/+1
|/ / / /
* | | | Merge pull request #13513 from ilja/masterArun Agrawal2013-12-281-3/+4
|\ \ \ \ | | | | | | | | | | Typo fix [ci skip]
| * | | | Typo fix [ci skip]Ilja Krijger2013-12-281-3/+4
|/ / / /
* | | | Merge branch 'master' of github.com:rails/railsGuillermo Iguaran2013-12-272-0/+15
|\ \ \ \
| * \ \ \ Merge pull request #13474 from jdelStrother/becomesYves Senn2013-12-272-0/+15
| |\ \ \ \ | | | | | | | | | | | | Copy changed_attributes across to newly become'd records
| | * | | | Copy changed_attributes across to newly become'd recordsJonathan del Strother2013-12-272-0/+15
| | | | | | | | | | | | | | | | | | Without this, the original record's values won't get saved, since the partial insertions support (https://github.com/rails/rails/commit/144e8691cbfb8bba77f18cfe68d5e7fd48887f5e) checks for changed values and thinks there are none.
* | | | | | Update to Unicode 6.3.0Norman Clarke2013-12-272-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 6.3.0 was released on September 30, 2013. http://unicode-inc.blogspot.com.ar/2013/09/announcing-unicode-standard-version-63.html
* | | | | Merge pull request #13505 from robin850/patch-13Yves Senn2013-12-272-1/+7
|\ \ \ \ \ | | | | | | | | | | | | Ensure backward compatibility between Minitest 5 and 4
| * | | | | Ensure backward compatibility between Minitest 5 and 4Robin Dupret2013-12-272-1/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define Minitest::Test in case we are running the gist under Minitest 4 and avoid relying on MiniTest::Unit::TestCase to avoid displaying warning on version five. [ci skip]
* | | | | Merge pull request #13483 from aditya-kapoor/add-missing-slashesYves Senn2013-12-276-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Adding missing backslashes in active_model files so as to avoid unwanted [ci skip]
| * | | | | Adding missing backslashes in active_model files so as to avoid unwanted ↵aditya-kapoor2013-12-276-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | links in rdoc [ci skip]
* | | | | | doc fix. Use `sess.path` within `open_session`. Closes #13490. [ci skip]Yves Senn2013-12-271-1/+1
| | | | | |
* | | | | | Merge pull request #13500 from arunagw/remove-unused-requireYves Senn2013-12-262-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | rbconfig is not used in these files remove unused requires
| * | | | | | rbconfig is not used in these filesArun Agrawal2013-12-262-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unused requires
* | | | | | | Merge pull request #13502 from arunagw/bug-report-template-warningGuillermo Iguaran2013-12-262-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Minitest::Unit::TestCase is Minitest::Test [ci skip]
| * | | | | | | Minitest::Unit::TestCase is Minitest::Test [ci skip]Arun Agrawal2013-12-262-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #13495 from norman/tidy_bytesJeremy Kemper2013-12-261-35/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Use String#scrub when available to tidy bytes
| * | | | | | Use String#scrub when available to tidy bytesNorman Clarke2013-12-261-35/+35
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #13498 from dmitrydims/masterArun Agrawal2013-12-261-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fixed typo in Rails 4.1 Release Notes [CI skip]
| * | | | | Fixed typo [CI skip]Semenyk Dmitriy2013-12-271-1/+1
|/ / / / /
* | | | | Merge pull request #13493 from Domon/improve-some-code-font-in-api-docXavier Noria2013-12-265-30/+31
|\ \ \ \ \ | | | | | | | | | | | | Improve font of some code in API documentation [ci skip]
| * | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 18:39:22 +0000