Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Show the user’s application in the source window and select the correct ↵ | Byron Bischoff | 2014-10-23 | 4 | -26/+76 |
| | | | | trace list, closes #17312 | ||||
* | 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] | ||||
| * | | - Changed description for AJ enqueuing methods to provide a sane description. | Vipul A M | 2014-10-21 | 1 | -3/+3 |
| | | | | | | | | | | | | [ci skip] | ||||
| * | | - Fix mentioned shortcut, to what the shortcut actually is, and that it ↵ | Vipul A M | 2014-10-21 | 2 | -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-docs | Yves Senn | 2014-10-20 | 1 | -0/+4 |
|\ \ | | | | | | | Mention `perform_now` in AJ base docs to specify how to immediately invoke a job [ci skip] | ||||
| * | | Mention `perform_now` in AJ base docs to specify how to immediately invoke a ↵ | Vipul A M | 2014-10-20 | 1 | -0/+4 |
| | | | | | | | | | | | | job. [ci skip] | ||||
* | | | docs, It's "Active Job" not "Active job". [ci skip] | Yves Senn | 2014-10-20 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #17324 from vipulnsward/activejob-warnings | Yves Senn | 2014-10-20 | 6 | -5/+7 |
|\ \ \ | | | | | | | | | Enable emitting of warnings from ActiveJob tests. | ||||
| * | | | - Removed unused variable warnings from ActiveJob Adapters | Vipul A M | 2014-10-19 | 5 | -5/+5 |
| | | | | |||||
| * | | | Enable emitting of warnings from ActiveJob tests. | Vipul A M | 2014-10-19 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge pull request #17019 from yuki24/add-class-name-to-unknown-attr-error | Yves Senn | 2014-10-20 | 3 | -7/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | Message on AR::UnknownAttributeError should include the class name of a record | ||||
| * | | | | AR::UnknownAttributeError should include the class name of a record | Yuki Nishijima | 2014-10-15 | 3 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would be helpful if 2 models have an attribute that has a similar name to the other. e.g: before: User.new(name: "Yuki Nishijima", projects_attributes: [name: "kaminari"]) # => ActiveRecord::UnknownAttributeError: unknown attribute: name after: User.new(name: "Yuki Nishijima", projects_attributes: [name: "kaminari"]) # => ActiveRecord::UnknownAttributeError: unknown attribute on User: name | ||||
* | | | | | AR::UnknownAttributeError should include the class name of a record | Yuki Nishijima | 2014-10-20 | 3 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would be helpful if 2 models have an attribute that has a similar name to the other. e.g: before: User.new(name: "Yuki Nishijima", projects_attributes: [name: "kaminari"]) # => ActiveRecord::UnknownAttributeError: unknown attribute: name after: User.new(name: "Yuki Nishijima", projects_attributes: [name: "kaminari"]) # => ActiveRecord::UnknownAttributeError: unknown attribute on User: name | ||||
* | | | | | Merge branch 'justanshulsharma-activerecord-merge-docs' | Zachary Scott | 2014-10-19 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Merge branch 'activerecord-merge-docs' of ↵ | Zachary Scott | 2014-10-19 | 1 | -1/+1 |
|/| | | | | | | | | | | | | | | | | | | | https://github.com/justanshulsharma/rails into justanshulsharma-activerecord-merge-docs | ||||
| * | | | | [ci skip] Make merge method nodoc | Anshul Sharma | 2014-10-20 | 1 | -8/+1 |
| | | | | | |||||
| * | | | | [ci skip] merge docs | Anshul Sharma | 2014-10-20 | 1 | -0/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #17323 from seuros/master | Rafael Mendonça França | 2014-10-19 | 2 | -4/+1 |
|\ \ \ \ | |/ / / |/| | | | remove duplicate method (_status_code) in action_dispatch | ||||
| * | | | remove duplicate method (_status_code) in action_dispatch | Abdelkader Boudih | 2014-10-19 | 2 | -4/+1 |
| | | | | |||||
* | | | | Merge pull request #17322 from vipulnsward/fix-test-warning | Matthew Draper | 2014-10-20 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fixed test throwing unused variable warning | ||||
| * | | | Fixed test throwing unused variable warning | Vipul A M | 2014-10-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #17321 from prathamesh-sonpatki/nodoc-status_at | Abdelkader Boudih | 2014-10-19 | 2 | -4/+4 |
|\ \ \ \ | |/ / / |/| | | | Make status_at methods nodoc | ||||
| * | | | Make _status_code methods nodoc | Prathamesh Sonpatki | 2014-10-19 | 2 | -4/+4 |
| | |/ | |/| | | | | | | | | | | - Also one minor change for documenting url_for method in ActionController::Metal. [ci skip] | ||||
* | | | Merge pull request #17319 from igas/fix-17318 | Matthew Draper | 2014-10-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix wrong example from #17318 [ci skip] | ||||
| * | | | fix wrong #17318 [ci skip] | Igor Kapkov | 2014-10-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #17318 from igas/guides-more-friendly-for-nonlatin | Abdelkader Boudih | 2014-10-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | make guides example more friendly to nonlatin langs [ci skip] | ||||
| * | | | make guides example more friendly to nonlatin langs | Igor Kapkov | 2014-10-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | :nail_care: it's -> its (see comments on 9a586ac) | Godfrey Chan | 2014-10-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #17314 from y-yagi/message_delivery_doc | Zachary Scott | 2014-10-18 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | [ci skip] add :queue option to deliver_later and deliver_later! documentation |