Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #19310 from square/aj-const-get | Arthur Nogueira Neves | 2015-03-12 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Use a more conservative `const_get` over `constantize` | Tamir Duberstein | 2015-03-12 | 1 | -1/+1 | |
* | | | | Merge pull request #19271 from eagletmt/304-content-type | Arthur Nogueira Neves | 2015-03-12 | 2 | -0/+13 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Also skip Content-Encoding and Vary header if 304 | Kohei Suzuki | 2015-03-12 | 2 | -4/+6 | |
| * | | | 304 response should not include Content-Type header | Kohei Suzuki | 2015-03-10 | 2 | -1/+12 | |
* | | | | Merge pull request #19308 from yui-knk/fix/doc_note | Abdelkader Boudih | 2015-03-12 | 1 | -1/+4 | |
|\ \ \ \ | ||||||
| * | | | | [ci skip] Take NOTE: as paragraph to make NOTE block | yui-knk | 2015-03-12 | 1 | -1/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #19301 from Empact/default-scopes | Carlos Antonio da Silva | 2015-03-12 | 6 | -19/+20 | |
|\ \ \ \ | ||||||
| * | | | | Isolate access to .default_scopes in ActiveRecord::Scoping::Default | Ben Woosley | 2015-03-12 | 6 | -19/+20 | |
* | | | | | Use `def setup` instead of `setup do` | eileencodes | 2015-03-12 | 1 | -2/+4 | |
* | | | | | Merge pull request #19303 from y-yagi/travel_to_doc | Abdelkader Boudih | 2015-03-12 | 1 | -9/+11 | |
|\ \ \ \ \ | ||||||
| * | | | | | add `DateTime.now` to list of `TimeHelpers#travel_to` stubbing [ci skip] | yuuji.yaginuma | 2015-03-12 | 1 | -9/+11 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #19299 from mattbrictson/pg-ruby-22 | Yves Senn | 2015-03-12 | 2 | -2/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Require pg~>0.18 to ensure Ruby 2.2 compatibility | Matt Brictson | 2015-03-11 | 2 | -2/+7 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #16992 from square/configurable-job-queue-adapter | Jeremy Kemper | 2015-03-12 | 4 | -17/+82 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | `ActiveJob::Base#queue_adapter` is now a `class_attribute` | Tamir Duberstein | 2015-03-11 | 4 | -17/+82 | |
* | | | | | Merge pull request #18459 from cantino/action_controller_guide_edits | Rafael Mendonça França | 2015-03-11 | 1 | -45/+44 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Edits for grammar and clarity, with help from georgeclaghorn and robin850. | Andrew Cantino | 2015-03-11 | 1 | -45/+44 | |
* | | | | | Merge pull request #19295 from square/aj-instances | Jeremy Kemper | 2015-03-11 | 19 | -153/+174 | |
|\ \ \ \ \ | ||||||
| * | | | | | `ActiveJob::QueueAdapters::*` are no longer singletons | Tamir Duberstein | 2015-03-11 | 18 | -152/+173 | |
| * | | | | | Fix naming collision | Tamir Duberstein | 2015-03-11 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | ||||||
* / | | | | Revert "Merge pull request #15476 from JacobEvelyn/master" | Jeremy Kemper | 2015-03-11 | 2 | -10/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #19289 from ahmad-alkheat/master | Yves Senn | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Unnecessary usage of self in the guides | Ahmad Al-kheat | 2015-03-11 | 1 | -1/+1 | |
* | | | | | Merge pull request #19288 from yui-knk/fix/routing | Abdelkader Boudih | 2015-03-11 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | [ci skip] Change to code element | yui-knk | 2015-03-11 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | pg, `disable_referential_integrity` only catches AR errors. | Yves Senn | 2015-03-11 | 2 | -3/+25 | |
* | | | | | fix typo in transaction argument. Closes #19265. | Yves Senn | 2015-03-11 | 1 | -1/+1 | |
* | | | | | Merge pull request #19280 from palkan/fix-pg-json-test | Yves Senn | 2015-03-11 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix json_test | palkan | 2015-03-11 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Use the released gem | Rafael Mendonça França | 2015-03-10 | 2 | -10/+2 | |
* | | | | | Merge pull request #19252 from kaspth/single-escaping-strip-tags | Rafael Mendonça França | 2015-03-10 | 6 | -7/+19 | |
|\ \ \ \ \ | ||||||
| * | | | | | Let strip_tags leave HTML escaping to Rails. | Kasper Timm Hansen | 2015-03-10 | 6 | -7/+19 | |
* | | | | | | Add YAML compatibility for objects from Rails 4.2 | Sean Griffin | 2015-03-10 | 4 | -27/+239 | |
* | | | | | | Attempt to provide backwards compatible YAML deserialization | Sean Griffin | 2015-03-10 | 4 | -0/+76 | |
* | | | | | | Merge pull request #19275 from keepcosmos/remove-autoload-path | Rafael Mendonça França | 2015-03-10 | 1 | -16/+16 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | remove unnecessary path parameters | keepcosmos | 2015-03-10 | 1 | -16/+16 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #19273 from Gaurav2728/gaurav-remove_test_after_commit_gem... | Arthur Nogueira Neves | 2015-03-10 | 1 | -5/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | ‘test_after_commit’ gem is not required in Rails 5 remove note from doc | Gaurav Sharam | 2015-03-10 | 1 | -5/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #19270 from AndrewHendrie/master | Zachary Scott | 2015-03-09 | 1 | -1/+1 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Changed 'blank space' to 'blank line' | Andrew Hendrie | 2015-03-09 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Fix intermittent test failures | Sean Griffin | 2015-03-09 | 1 | -0/+1 | |
* | | | | Call super last in before_setup | eileencodes | 2015-03-09 | 2 | -1/+13 | |
* | | | | Revert "Revert integration test refactoring that caused app test regressions" | eileencodes | 2015-03-09 | 2 | -18/+10 | |
* | | | | Merge pull request #19243 from yui-knk/fix/require | Rafael Mendonça França | 2015-03-09 | 2 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix place of require 'rails_guides/markdown' | yui-knk | 2015-03-07 | 2 | -1/+1 | |
* | | | | | Fix intermittent test failures | Sean Griffin | 2015-03-09 | 1 | -0/+1 | |
* | | | | | Merge pull request #19264 from y-yagi/plugins_guide | Arthur Nogueira Neves | 2015-03-09 | 1 | -3/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | use public Module#include instead of send :include [ci skip] | yuuji.yaginuma | 2015-03-09 | 1 | -3/+3 | |
* | | | | | | Revert "Take DST into account when locating TimeZone from Numeric." | Andrew White | 2015-03-09 | 3 | -24/+1 | |
|/ / / / / |