aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove "rescue" clause around "require 'openssl'"claudiob2014-12-033-32/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some `require 'openssl'` statements were surrounded by `rescue` blocks to deal with Ruby versions that did not support `OpenSSL::Digest::SHA1` or `OpenSSL::PKCS5`. [As @jeremy explains](https://github.com/rails/rails/commit/a6a0904fcb12b876469c48b1c885aadafe9188cf#commitcomment-8826666) in the original commit: > If jruby didn't have jruby-openssl gem, the require wouldn't work. Not sure whether either of these are still relevant today. According to the [release notes for JRuby 1.7.13](http://www.jruby.org/2014/06/24/jruby-1-7-13.html): > jruby-openssl 0.9.5 bundled which means the above `rescue` block is not needed anymore. All the Ruby versions supported by the current version of Rails provide those OpenSSL libraries, so Travis CI should also be happy by removing the `rescue` blocks. --- Just to confirm, with JRuby: $ ruby --version #=> jruby 1.7.16.1 (1.9.3p392) 2014-10-28 4e93f31 on Java HotSpot(TM) 64-Bit Server VM 1.8.0_20-b26 +jit [darwin-x86_64] $ irb irb(main):001:0> require 'openssl' #=> true irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1 irb(main):003:0> OpenSSL::PKCS5 # => OpenSSL::PKCS5 And with Ruby 2.1: $ ruby --version #=> ruby 2.1.2p95 (2014-05-08 revision 45877) [x86_64-darwin13.0] $ irb irb(main):001:0> require 'openssl' #=> true irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1 irb(main):003:0> OpenSSL::PKCS5 #=> OpenSSL::PKCS5
* Merge pull request #17891 from ↵Guillermo Iguaran2014-12-031-5/+4
|\ | | | | | | | | prathamesh-sonpatki/remove-mocha-from-info-controller-tests Removed use of mocha in the info_controller tests
| * Removed use of mocha in the info_controller testsPrathamesh Sonpatki2014-12-031-5/+4
| |
* | Merge pull request #17898 from mrgilman/move-predicate-builder-to-constructorSean Griffin2014-12-031-4/+5
|\ \ | | | | | | Move PredicateBuilder instantiation to constructor
| * | Move PredicateBuilder instantiation to constructorMelanie Gilman2014-12-031-4/+5
| | | | | | | | | | | | In order to maintain thread safety and prevent race condition from memoization.
* | | Active Record changelog needs to keep pointing at 4-2-stable. #17651Yves Senn2014-12-031-1/+1
| | | | | | | | | | | | [ci skp]
* | | docs, add new changelog entries at the top :sweat: [ci skip] #17651Yves Senn2014-12-031-5/+5
| | |
* | | Merge pull request #17651 from ↵Yves Senn2014-12-038-11/+16
|\ \ \ | |/ / |/| | | | | | | | | | | CLUSTERfoo/fix/adding_timestamps_migration_not_reversible Failure to rollback t.timestamps when within a change_table migration
| * | Failure to rollback t.timestamps when within a change_table migrationnoam2014-12-038-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running the following migration: change_table(:table_name) { |t| t/timestamps } The following error was produced: wrong number of arguments (2 for 1) .... /connection_adapters/abstract/schema_statements.rb:851:in `remove_timestamps' This is due to `arguments` containing an empty hash as its second argument.
* | | document that `.delete` does work on `#readonly?` records. Closes #11860Yves Senn2014-12-031-0/+2
|/ / | | | | | | | | | | | | | | [ci skip] This is due to the fact that `.delete` is directly translated to SQL. It tries to follow the same rules as `.delete_all` which is not able to verify that records are `#readonly?`.
* | skip test to get `sqlite3_mem` suite passing.Yves Senn2014-12-031-1/+1
| |
* | Merge pull request #17890 from sergey-alekseev/remove-useless-methodsYves Senn2014-12-031-10/+0
|\ \ | | | | | | remove useless methods
| * | remove useless methodsSergey Alekseev2014-12-031-10/+0
| | |
* | | Merge pull request #17892 from y-yagi/active_support_core_extensions_guideZachary Scott2014-12-021-18/+0
|\ \ \ | |_|/ |/| | [ci skip] remove references to `Numeric#from_now`
| * | [ci skip] remove references to `Numeric#from_now`yuuji.yaginuma2014-12-031-18/+0
| | |
* | | Merge pull request #17889 from mxie/mx-fix-nonexistent-typoSean Griffin2014-12-027-11/+11
|\ \ \ | |_|/ |/| | Fix "nonexistent" typo in tests
| * | Fix "nonexistent" typo in testsMelissa Xie2014-12-027-11/+11
| | |
* | | Require missing association in testSean Griffin2014-12-021-0/+1
|/ /
* | Merge pull request #17888 from mrgilman/dot-notationSean Griffin2014-12-022-29/+40
|\ \ | | | | | | Refactor `build_from_hash` to convert dot notation to hash first
| * | Refactor `build_from_hash` to convert dot notation to hash firstMelanie Gilman2014-12-022-29/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that we're handling all forms of nested tables the same way. We're aware that the `convert_dot_notation_to_hash` method will cause a performance hit, and we intend to come back to it once we've refactored some of the surrounding code. [Melissa Xie & Melanie Gilman]
* | | require 'rake' before requiring Rake tasksAkira Matsuda2014-12-031-0/+2
|/ / | | | | | | | | | | Without this, % rails r "require 'rails/tasks'" would cause a NoMethodError: undefined method `desc' for main:Object
* | Merge pull request #17886 from mrgilman/refactor-predicate-builderSean Griffin2014-12-024-19/+32
|\ \ | | | | | | Refactor `PredicateBuilder` from singleton to instance
| * | Refactor `PredicateBuilder` from singleton to instanceMelanie Gilman2014-12-024-19/+32
| | |
* | | Action View is needed for DebugExceptionsRafael Mendonça França2014-12-021-0/+2
| | | | | | | | | | | | We should remove this dependency later.
* | | Merge pull request #17881 from deeeki/unscope_arel_whereRafael Mendonça França2014-12-022-1/+9
|\ \ \ | | | | | | | | Allow to unscope where conditions by arel_table with symbol
| * | | Allow to unscope where conditions using `arel_table` with Symboldeeeki2014-12-032-1/+9
| |/ / | | | | | | | | | | | | | | | This commit fixes the following case. User.where(User.arel_table[:created_at].lteq(1.year.ago)).unscope(where :created_at)
* | | Fix typo [ci skip]Andrew White2014-12-021-2/+2
| | |
* | | Clarify change to process helpers [ci skip]Andrew White2014-12-021-0/+11
| | | | | | | | | | | | | | | | | | | | | Add additional information to the release notes to explain the requirement for paths in integration tests to start with a leading slash. Fixes #17870.
* | | Add some FIXME notes about documentation [ci skip]Rafael Mendonça França2014-12-021-0/+4
|/ /
* | Prefer object/nil over `true`/`false`Rafael Mendonça França2014-12-021-6/+4
| | | | | | | | | | | | | | | | | | | | | | This is the project guideline and the reasons are: * That follows standard Ruby semantics. * Allows the implementation to avoid artificial code like !! or something ? true : false * You do not need to rely on the exact type of 3rd party code. For example, if your method returns str.end_with?('foo') you do not need to make sure end_with? returns a singleton. Your predicate just propagates predicate semantics up regardless of what end_with? returns.
* | Merge pull request #17873 from kirs/refactor-debug-erbRafael Mendonça França2014-12-024-23/+54
|\ \ | | | | | | Refactor debug view
| * | Refactor debug viewKir Shatrov2014-12-024-23/+54
| | | | | | | | | Avoid logic in ERB and use helpers
* | | Merge pull request #17727 from lleger/lleger-add-methods-to-message-verifierSean Griffin2014-12-023-22/+47
|\ \ \ | | | | | | | | Add new methods to MessageVerifier
| * | | Add `#verified` and `#valid_message?` to MessageVerifierLogan Leger2014-12-013-22/+47
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a `#verified` method to `ActiveSupport::MessageVerifier` which will return either `false` when it encounters an error or the message. `#verify` continues to raise an `InvalidSignature` exception on error. This commit also adds a convenience boolean method on `MessageVerifier` as a way to check if a message is valid without performing the decoding.
* | | Merge pull request #17867 from tgxworld/silence_minitest_pluginsRafael Mendonça França2014-12-022-1/+4
|\ \ \ | | | | | | | | Silence Minitest for plugin tests.
| * | | Silence Minitest for plugin tests.Guo Xiang Tan2014-12-022-1/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/17340. Use Minitest::BacktraceFilter instead of removing all silencers. This will allow the backtrace for all libraries in the plugin to be shown while removing noise generated by Minitest's backtrace.
* | | Merge pull request #17862 from lucasmazza/lm-hide-actionRafael Mendonça França2014-12-022-1/+4
| | | | | | | | | | | | `_generate_paths_by_default` should always be private.
* | | Allow failures for mysql adapter testsRafael Mendonça França2014-12-021-2/+1
| | |
* | | Merge pull request #17576 from senny/native_database_typesYves Senn2014-12-024-7/+13
|\ \ \ | | | | | | | | no need to pass native_database_types around
| * | | no need to pass native_database_types aroundYves Senn2014-12-024-7/+13
|/ / /
* | | pg tests, get rid of global schema `schema_1`.Yves Senn2014-12-023-53/+51
| | |
* | | pg tests, move uniqueness validation test to array tests.Yves Senn2014-12-023-27/+16
| | |
* | | tests, extract pg number tests into separate file.Yves Senn2014-12-023-44/+51
| | |
* | | tests, move schema shorthand assertions into pg specific tests.Yves Senn2014-12-0210-131/+89
| | |
* | | tests, move pg geometric tests out of `base_test`.Yves Senn2014-12-023-106/+73
| | |
* | | Merge pull request #17878 from claudiob/remove-unused-modgreet-fixtureYves Senn2014-12-021-1/+0
|\ \ \ | | | | | | | | Remove unused AV/test/fixtures/scope
| * | | Remove unused AV/test/fixtures/scopeclaudiob2014-12-011-1/+0
| |/ / | | | | | | | | | | | | The file `modgreet.erb` was added 8 years ago in 21187c0 and is not used anymore by any test.
* | | Merge pull request #17877 from claudiob/remove-happy-path-fixtureYves Senn2014-12-021-1/+0
|\ \ \ | |/ / |/| | Remove unused AV/test/fixtures/happy_path
| * | Remove unused AV/test/fixtures/happy_pathclaudiob2014-12-011-1/+0
|/ / | | | | | | | | | | | | | | | | | | The `test/fixtures/happy_path/render_action/hello_world.erb` file was introduced in 8ab37c7 for the `TestRenderAction` test. That test was subsequently removed in 34f058e, so the fixture is not used anymore. If Travis CI is happy, then you can be sure the fixture can be removed.
* | Merge pull request #17871 from claudiob/remove-unused-blog-public-fixturesSantiago Pastorino2014-12-024-4/+0
|\ \ | | | | | | Remove unused AV/test/fixtures/blog_public
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 11:15:53 +0000