aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #17391 from prathamesh-sonpatki/fix-oid-description-ci-skipEileen M. Uchitelle2014-10-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Fix description of OID in TypeMapInitializer
| * | | | | | | | | | | Fix description of OID in TypeMapInitializerPrathamesh Sonpatki2014-10-251-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | give a better error message for misspelled helpersXavier Noria2014-10-253-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See comment in this patch for the rationale. References #16468
* | | | | | | | | | | fixes circularity check in dependenciesXavier Noria2014-10-254-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for circular loading should depend on a stack of files being loaded at the moment, rather than the collection of loaded files. This showed up indirectly in #16468, where a misspelled helper would incorrectly result in a circularity error message. References #16468
* | | | | | | | | | | instance_eval is evilAkira Matsuda2014-10-251-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Reduce object allocationAkira Matsuda2014-10-251-1/+5
| | | | | | | | | | |
* | | | | | | | | | | Reduce object allocationAkira Matsuda2014-10-251-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Avoid creating range objects (take II)Akira Matsuda2014-10-251-1/+5
| | | | | | | | | | |
* | | | | | | | | | | The code was not up-to-dateAkira Matsuda2014-10-251-9/+7
| | | | | | | | | | |
* | | | | | | | | | | Avoid creating unneeded Hash instance and calling slow Hash#fetchAkira Matsuda2014-10-251-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #17385 from nakadai/patch-1Zachary Scott2014-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in "Active Record Basics" guide. [ci skip]
| * | | | | | | | | | | Fix typo in "Active Record Basics" guide. [ci skip]nakadai2014-10-241-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Revert a change made to the example in 1ac4525Godfrey Chan2014-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @carlosantoniodasilva pointed out that when `@person` is nil then this would blow up when you ended up calling `#first`on `nil`. > "there’s no way to break a try chain when you enter it :D" [ci skip]
* | | | | | | | | | | Include return value in examples added in #17378 [ci skip]Zachary Scott2014-10-241-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Improved try documentation [ci skip]Eugene Gilburg2014-10-241-8/+25
| |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - better `if` example - Added chaining example to the try method description - Documented the `respond_to?` check to the try method description - Clearer wording to explain that argument error is raised on argument mismatch to responding method, rather than to non-responding method (which is handled without exception by `try`) - `.any?` is more precise than `! .blank?` - Don't need to use `try` on `children` as (for regular associations) they will always be a collection or array that responds to `first` - Fix typos/grammar
* | | | | | | | | | Merge pull request #17381 from jonatack/patch-8Santiago Pastorino2014-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | AR Migrations Guide#Foreign Keys: fix wrong table
| * | | | | | | | | AR Migrations Guide#Foreign Keys: fix wrong tableJon Atack2014-10-241-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | | | Merge pull request #17377 from aripollak/dry-try-bangGodfrey Chan2014-10-231-10/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | DRY up try/try!
| * | | | | | | | | DRY up try/try!Ari Pollak2014-10-231-10/+6
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #17369 from rails/secure_compareGuillermo Iguaran2014-10-234-14/+33
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Secure compare
| * | | | | | | | Use AS secure_compare for CSRF token comparisonGuillermo Iguaran2014-10-231-2/+2
| | | | | | | | |
| * | | | | | | | Use AS secure_compare in AS::MessageVerifierGuillermo Iguaran2014-10-231-12/+2
| | | | | | | | |
| * | | | | | | | Add AS::SecurityUtils.secure_compare for constant time string comparisonGuillermo Iguaran2014-10-232-0/+29
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mrgilman-reword-uncountable-documentation'Zachary Scott2014-10-231-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Reword documentation for `uncountable` [ci skip]Melanie Gilman2014-10-231-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #17355 from vipulnsward/aj-string-fixesYves Senn2014-10-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix error string raised from AJ enqueue_at for ClassQueueAdapter
| * | | | | | | - Fix error string raised from `enqueue_at`Vipul A M2014-10-221-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #17343 from vipulnsward/inline-aj-callbacksYves Senn2014-10-231-16/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Inline AJ around_perform and around_enqueue in CallbackJob used for tests
| * | | | | | | | - Inline AJ around_perform and around_enqueue in CallbackJob used for tests.Vipul A M2014-10-211-16/+13
| |/ / / / / / /
* | | | | | | | Update CHANGELOG and release notes for e98f2a7Godfrey Chan2014-10-222-2/+6
| | | | | | | |
* | | | | | | | Merge pull request #17361 from aripollak/try-bang-parityGodfrey Chan2014-10-222-5/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bring try! into parity with try.
| * | | | | | | | Bring try! into parity with try.Ari Pollak2014-10-222-5/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Based on commit 5e51bdda.
* | | | | | | | Merge pull request #17353 from swapdisc/activejob-queue-test-typoRafael Mendonça França2014-10-221-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | :nail_care: fix typos in activejob queuing test
| * | | | | | | :nail_care: fix typos in activejob queuing testJoe Lewis2014-10-221-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #17346 from accessd/fix-small-typo-in-testRafael Mendonça França2014-10-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix small typo in routing test
| * | | | | | | fix small typo in routing testAccessd2014-10-211-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #17313 from accessd/fix-url-generation-error-messageRafael Mendonça França2014-10-212-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix url generation error message
| * | | | | | | fix url generation error messageAccessd2014-10-212-1/+11
| | | | | | | |
* | | | | | | | Oops, missed a closing bracket [ci skip]Godfrey Chan2014-10-211-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #17336 from rebyn/patch-1Godfrey Chan2014-10-211-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Provide more reasoning to not accept cosmetic changes [ci skip]
| * | | | | | | [ci skip] Provide more reasoning to not accept cosmetic changesTu Hoang2014-10-211-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #17331 from vipulnsward/activejob-cleanupsRafael Mendonça França2014-10-203-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Activejob cleanups
| * | | | | | | - Remove duplication in AJ logging test for setting logger.Vipul A M2014-10-202-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove un-needed require in AJ rescue test.
| * | | | | | | No need to specify log level, run at log level as all other Rails components.Vipul A M2014-10-201-1/+0
| |/ / / / / /
* | | | | | | Merge pull request #17337 from claudiob/remove-duplicate-select-methodRafael Mendonça França2014-10-205-17/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove duplicate 'select' database statement
| * | | | | | | Remove duplicate 'select' database statementclaudiob2014-10-205-17/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `select` method has the same definition in almost all database adapters, so it can be moved from the database-specific adapters (PostgreSQl, MySQL, SQLite) to the abstract `database_statement`: ```ruby def select(sql, name = nil, binds = []) exec_query(sql, name, binds) end ``` --- More details about this commit: the only two DB-specific adapters that have a different definition of `select` are MySQLAdapter and MySQL2Adapter. In MySQLAdapter, `select` invokes `exec_query(sql, name, binds)`, so calling `super` achieves the same goal with less repetition. In MySQL2Adapter, `select` invokes `exec_query(sql, name)`, that is, it does not pass the `binds` parameter like other methods do. However, [MySQL2Adapter's `exec_query`](https://github.com/rails/rails/blob/74a527cc63ef56f3d0a42cf638299958dc7cb08c/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb#L228L231) works exactly the same whether this parameters is passed or not, so the output does not change: ```ruby def exec_query(sql, name = 'SQL', binds = []) result = execute(sql, name) ActiveRecord::Result.new(result.fields, result.to_a) end ```
* | | | | | | Merge pull request #17338 from vipulnsward/aj-doc-fixesRafael Mendonça França2014-10-203-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | AJ doc fixes [ci skip]
| * | | | | | - Changed description for AJ enqueuing methods to provide a sane description.Vipul A M2014-10-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | - Fix mentioned shortcut, to what the shortcut actually is, and that it ↵Vipul A M2014-10-212-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accepts blocks for `assert_no_enqueued_jobs` and `assert_no_performed_jobs` test helpers. - args => arguments when used in actual docs. [ci skip]
* | | | | | Merge pull request #17329 from vipulnsward/mention-perform-later-docsYves Senn2014-10-201-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Mention `perform_now` in AJ base docs to specify how to immediately invoke a job [ci skip]