aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #13538 from robin850/patch-14Yves Senn2013-12-301-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add a missing changelog entry for #13534 [ci skip]
| * | | | | | Add a missing changelog entry for #13534 [ci skip]Robin Dupret2013-12-301-0/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Remove deprecation warning for FIXTURES_PATHPiotr Sarnacki2013-12-301-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIXTURES_PATH has a bit different case than DatabaseTasks.fixtures_path, which was added along with deprecation. A use case for FIXTURES_PATH could be loading fixtures from a different directory just for a given test run. The implementation is fairly simple, so leaving it as it is won't hurt.
* | | | | | Revert "Install bundle gems to the system not to vendor/bundle"Piotr Sarnacki2013-12-301-1/+0
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 875dd3edfd34eaa20120b6589b0d1905230e948f. The issue was fixed in rbx-2.2.3
* | | | | Merge pull request #13535 from schneems/schneems/extract-url-logicRafael Mendonça França2013-12-291-34/+79
|\ \ \ \ \ | | | | | | | | | | | | Extract db url connection logic to class
| * | | | | Extract db url connection logic to classschneems2013-12-291-34/+79
| |/ / / /
* | | | | Merge pull request #13527 from kuldeepaggarwal/f-independent-specsJosé Valim2013-12-293-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Use user-defined configurations in mysql tests
| * | | | | used user-defined configurations for running tests that might depend on ↵Kuldeep Aggarwal2013-12-293-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | user's system configuration
* | | | | | Merge pull request #13534 from kuldeepaggarwal/f-where-notJosé Valim2013-12-292-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | raise ArgumentError for nil in .where.not
| * | | | | | raise `ArgumentError` exception if `Model.where.not` is called with `nil` ↵Kuldeep Aggarwal2013-12-302-0/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | argument
* | | | | | Fix Encoding::CompatibilityError when public path is UTF-8Andrew White2013-12-298-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #5337 we forced the path encoding to ASCII-8BIT to prevent static file handling from blowing up before an application has had chance to deal with possibly invalid urls. However this has a negative side effect of making it an incompatible encoding if the application's public path has UTF-8 characters in it. To work around the problem we check to see if the path has a valid encoding once it has been unescaped. If it is not valid then we can return early since it will not match any file anyway. Fixes #13518
* | | | | | Fix method redefined warning message in mapper.rbAndrew White2013-12-291-2/+3
|/ / / / /
* | | | | Install bundle gems to the system not to vendor/bundlePiotr Sarnacki2013-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rubinius has problems with bundling when shared gems are disabled (ie. when --path or --deployhment is used). There is no real reason to install it with --path on TravisCI, so I'm dropping it.
* | | | | blank? and present? commit to return singletons [Xavier Noria & Pavel Pravosud]Xavier Noria2013-12-283-25/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contract of blank? and present? was in principle to return Object, as we generally do, the test suite and description was consistent with that, but some examples had comments like "# => true". This cannot be unclear, we either fix the examples, or update the contract. Since users may be already assuming singletons due to the examples and the fact that they were returned before 30ba7ee, the safest option seems to be to revise the contract and the implementation of String#blank? The motivation for 30ba7ee was to improve the performance of the predicate, the refactor based on === is on par regarding speed. With this commit we start documenting return types using YARD conventions. We plan to document return types gradually.
* | | | | Merge pull request #13517 from jetthoughts/13516_blank_to_return_true_falseXavier Noria2013-12-281-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | String#blank? returns True/False
| * | | | Extracted blank matcher regexp to constantPaul Nikitochkin2013-12-281-1/+3
|/ / / /
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:48:34 +0000