Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "development.rb should mention available log levels" | Godfrey Chan | 2014-11-01 | 1 | -5/+0 |
| | | | | | | This reverts commit 102ba5fd69f18c7d58d70247090fbdeadfc53ca1. Reason: code/template changes cannot be made in docrails | ||||
* | development.rb should mention available log levels | Thiago Pinto | 2014-11-01 | 1 | -0/+5 |
| | |||||
* | [ci skip] Add highlight to code (form helper guide). | Juanito Fatas | 2014-10-25 | 1 | -1/+1 |
| | |||||
* | [ci skip] No need to indent here (AC overview). | Juanito Fatas | 2014-10-25 | 1 | -6/+6 |
| | |||||
* | [ci skip] Add missing blank line to AR validation. | Juanito Fatas | 2014-10-25 | 1 | -0/+1 |
| | |||||
* | give a better error message for misspelled helpers | Xavier Noria | 2014-10-25 | 3 | -1/+38 |
| | | | | | | See comment in this patch for the rationale. References #16468 | ||||
* | fixes circularity check in dependencies | Xavier Noria | 2014-10-25 | 4 | -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 evil | Akira Matsuda | 2014-10-25 | 1 | -1/+1 |
| | |||||
* | Reduce object allocation | Akira Matsuda | 2014-10-25 | 1 | -1/+5 |
| | |||||
* | Reduce object allocation | Akira Matsuda | 2014-10-25 | 1 | -1/+1 |
| | |||||
* | Avoid creating range objects (take II) | Akira Matsuda | 2014-10-25 | 1 | -1/+5 |
| | |||||
* | The code was not up-to-date | Akira Matsuda | 2014-10-25 | 1 | -9/+7 |
| | |||||
* | Avoid creating unneeded Hash instance and calling slow Hash#fetch | Akira Matsuda | 2014-10-25 | 1 | -1/+1 |
| | |||||
* | Merge pull request #17385 from nakadai/patch-1 | Zachary Scott | 2014-10-24 | 1 | -1/+1 |
|\ | | | | | Fix typo in "Active Record Basics" guide. [ci skip] | ||||
| * | Fix typo in "Active Record Basics" guide. [ci skip] | nakadai | 2014-10-24 | 1 | -1/+1 |
|/ | |||||
* | Revert a change made to the example in 1ac4525 | Godfrey Chan | 2014-10-24 | 1 | -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 Scott | 2014-10-24 | 1 | -2/+2 |
| | |||||
* | Improved try documentation [ci skip] | Eugene Gilburg | 2014-10-24 | 1 | -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-8 | Santiago Pastorino | 2014-10-24 | 1 | -1/+1 |
|\ | | | | | AR Migrations Guide#Foreign Keys: fix wrong table | ||||
| * | AR Migrations Guide#Foreign Keys: fix wrong table | Jon Atack | 2014-10-24 | 1 | -1/+1 |
|/ | | | [skip ci] | ||||
* | Merge pull request #17377 from aripollak/dry-try-bang | Godfrey Chan | 2014-10-23 | 1 | -10/+6 |
|\ | | | | | DRY up try/try! | ||||
| * | DRY up try/try! | Ari Pollak | 2014-10-23 | 1 | -10/+6 |
| | | |||||
* | | Merge pull request #17369 from rails/secure_compare | Guillermo Iguaran | 2014-10-23 | 4 | -14/+33 |
|\ \ | |/ |/| | Secure compare | ||||
| * | Use AS secure_compare for CSRF token comparison | Guillermo Iguaran | 2014-10-23 | 1 | -2/+2 |
| | | |||||
| * | Use AS secure_compare in AS::MessageVerifier | Guillermo Iguaran | 2014-10-23 | 1 | -12/+2 |
| | | |||||
| * | Add AS::SecurityUtils.secure_compare for constant time string comparison | Guillermo Iguaran | 2014-10-23 | 2 | -0/+29 |
| | | |||||
* | | Merge branch 'mrgilman-reword-uncountable-documentation' | Zachary Scott | 2014-10-23 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Reword documentation for `uncountable` [ci skip] | Melanie Gilman | 2014-10-23 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #17355 from vipulnsward/aj-string-fixes | Yves Senn | 2014-10-23 | 1 | -1/+1 |
|\ | | | | | Fix error string raised from AJ enqueue_at for ClassQueueAdapter | ||||
| * | - Fix error string raised from `enqueue_at` | Vipul A M | 2014-10-22 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #17343 from vipulnsward/inline-aj-callbacks | Yves Senn | 2014-10-23 | 1 | -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 M | 2014-10-21 | 1 | -16/+13 |
| |/ | |||||
* | | Update CHANGELOG and release notes for e98f2a7 | Godfrey Chan | 2014-10-22 | 2 | -2/+6 |
| | | |||||
* | | Merge pull request #17361 from aripollak/try-bang-parity | Godfrey Chan | 2014-10-22 | 2 | -5/+9 |
|\ \ | | | | | | | Bring try! into parity with try. | ||||
| * | | Bring try! into parity with try. | Ari Pollak | 2014-10-22 | 2 | -5/+9 |
|/ / | | | | | | | Based on commit 5e51bdda. | ||||
* | | Merge pull request #17353 from swapdisc/activejob-queue-test-typo | Rafael Mendonça França | 2014-10-22 | 1 | -2/+2 |
|\ \ | | | | | | | :nail_care: fix typos in activejob queuing test | ||||
| * | | :nail_care: fix typos in activejob queuing test | Joe Lewis | 2014-10-22 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #17346 from accessd/fix-small-typo-in-test | Rafael Mendonça França | 2014-10-21 | 1 | -1/+1 |
|\ \ | | | | | | | fix small typo in routing test | ||||
| * | | fix small typo in routing test | Accessd | 2014-10-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #17313 from accessd/fix-url-generation-error-message | Rafael Mendonça França | 2014-10-21 | 2 | -1/+11 |
|\ \ | | | | | | | Fix url generation error message | ||||
| * | | fix url generation error message | Accessd | 2014-10-21 | 2 | -1/+11 |
| | | | |||||
* | | | Oops, missed a closing bracket [ci skip] | Godfrey Chan | 2014-10-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #17336 from rebyn/patch-1 | Godfrey Chan | 2014-10-21 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Provide more reasoning to not accept cosmetic changes [ci skip] | ||||
| * | | [ci skip] Provide more reasoning to not accept cosmetic changes | Tu Hoang | 2014-10-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #17331 from vipulnsward/activejob-cleanups | Rafael Mendonça França | 2014-10-20 | 3 | -4/+1 |
|\ \ \ | | | | | | | | | Activejob cleanups | ||||
| * | | | - Remove duplication in AJ logging test for setting logger. | Vipul A M | 2014-10-20 | 2 | -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 M | 2014-10-20 | 1 | -1/+0 |
| |/ / | |||||
* | | | Merge pull request #17337 from claudiob/remove-duplicate-select-method | Rafael Mendonça França | 2014-10-20 | 5 | -17/+3 |
|\ \ \ | | | | | | | | | Remove duplicate 'select' database statement | ||||
| * | | | Remove duplicate 'select' database statement | claudiob | 2014-10-20 | 5 | -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-fixes | Rafael Mendonça França | 2014-10-20 | 3 | -6/+6 |
|\ \ \ | |/ / |/| | | AJ doc fixes [ci skip] |