Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleaning JavaScriptHelperTest | Thiago Pradi | 2015-03-14 | 1 | -8/+1 |
| | |||||
* | Cleaning unused views from actionpack tests inside actionview | Thiago Pradi | 2015-03-14 | 1 | -1/+0 |
| | |||||
* | Zlib isn't required for AssetTagHelperTest anymore | Thiago Pradi | 2015-03-14 | 1 | -1/+0 |
| | |||||
* | Cleaning unused methods from abstract_unit | Thiago Pradi | 2015-03-14 | 1 | -57/+0 |
| | |||||
* | Deleting unused fixtures | Thiago Pradi | 2015-03-14 | 2 | -10/+0 |
| | |||||
* | Merge pull request #19335 from JahBrewski/master | Arthur Nogueira Neves | 2015-03-14 | 1 | -1/+1 |
|\ | | | | | [ci skip] Subject-verb agreement | ||||
| * | [ci skip] Subject-verb agreement | Joel Brewer | 2015-03-14 | 1 | -1/+1 |
|/ | |||||
* | Fix before_commit when updating a record on the callback | Arthur Neves | 2015-03-14 | 2 | -23/+44 |
| | |||||
* | Merge pull request #19322 from ↵ | Rafael Mendonça França | 2015-03-13 | 1 | -1/+1 |
|\ | | | | | | | | | AndrewHendrie/AndrewHendrie-guides-testing-partials-patch Asserting partials modification | ||||
| * | Asserting partials modification | Andrew Hendrie | 2015-03-13 | 1 | -1/+1 |
| | | | | | | Changed "create Articles view" to "new article view". The create action doesn't typically have a view assigned to it. The view that's being referred to is the 'new' Article view. | ||||
* | | Merge pull request #19323 from naoty/rake_initializer | Rafael Mendonça França | 2015-03-13 | 3 | -0/+14 |
|\ \ | | | | | | | Add `rake initializer` | ||||
| * | | Add `rake initializer` | Naoto Kaneko | 2015-03-14 | 3 | -0/+14 |
| | | | | | | | | | | | | | | | This task prints out initializers for an application. It is useful to develop a rubygem which involves the initialization process. | ||||
* | | | Added missing closing brace in sample code for safe HTML translations | Christian Ress | 2015-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes #19321. [ci skip] | ||||
* | | | Merge pull request #19291 from hired/return-truthy-value-from-head | Rafael Mendonça França | 2015-03-13 | 2 | -0/+13 |
|\ \ \ | | | | | | | | | Return truthy value from head method | ||||
| * | | | Return true from head method | Joel Hayhurst | 2015-03-12 | 2 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | It was returning false in normal circumstances. This broke the `head :ok and return if` construct. Add appropriate test. | ||||
* | | | | Merge pull request #19311 from square/aj-adapter-lookup | Rafael Mendonça França | 2015-03-13 | 2 | -5/+9 |
|\ \ \ \ | | | | | | | | | | | `QueueAdapters` now does lazy lookup | ||||
| * | | | | `QueueAdapters` does the lookup | Tamir Duberstein | 2015-03-12 | 2 | -5/+9 |
| | | | | | |||||
* | | | | | Merge pull request #19315 from josh/update-sprockets-links | Rafael Mendonça França | 2015-03-13 | 6 | -10/+10 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | Update sprockets links to point to rails org | ||||
| * | | | | Update sprockets links to point to rails org | Joshua Peek | 2015-03-13 | 6 | -10/+10 |
|/ / / / | |||||
* | | | | Merge pull request #19317 from kuldeepaggarwal/doc-select-tag-output | Abdelkader Boudih | 2015-03-13 | 1 | -15/+15 |
|\ \ \ \ | | | | | | | | | | | [ci skip] correct output of select | ||||
| * | | | | [ci skip] correct output of select | Kuldeep Aggarwal | 2015-03-13 | 1 | -15/+15 |
|/ / / / | |||||
* | | | | Merge pull request #19313 from akshay-vishnoi/options-docs | Rafael Mendonça França | 2015-03-12 | 1 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | [CI SKIP] Correct output of options_for_select | ||||
| * | | | | [CI SKIP] Correct output of options_for_select | Akshay Vishnoi | 2015-03-13 | 1 | -5/+5 |
|/ / / / | |||||
* | | | | Merge pull request #19312 from mariusbutuc/fix-mailer-testing-typo | Rafael Mendonça França | 2015-03-12 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fix typo in the Testing Your Mailers docs | ||||
| * | | | Fix typo in the “Testing Your Mailers” docs | Marius Butuc | 2015-03-12 | 1 | -1/+1 |
|/ / / | | | | | | | * [ci skip] | ||||
* | | | Merge pull request #19309 from f1sherman/dont-set-session-options-id | Guillermo Iguaran | 2015-03-12 | 5 | -13/+5 |
|\ \ \ | | | | | | | | | Use request.session.id instead of request.session_options[:id] | ||||
| * | | | Use request.session.id instead of request.session_options[:id] | Brian John | 2015-03-12 | 5 | -13/+5 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | As of the upgrade to Rack 1.5, request.session_options[:id] is no longer populated. Reflect this change in the tests by using request.session.id instead. Related change in Rack: https://github.com/rack/rack/commit/83a270d6 | ||||
* | | | 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` | ||||
| * | | | 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 |
|\ \ \ \ | |/ / / |/| | | | 304 response should not include Content-Type header | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | Rack::Lint raises an error saying "Content-Type header found in 304 response, not allowed". | ||||
* | | | | 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 | ||||
| * | | | | [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 | ||||
| * | | | | Isolate access to .default_scopes in ActiveRecord::Scoping::Default | Ben Woosley | 2015-03-12 | 6 | -19/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead use .scope_attributes? consistently in ActiveRecord to check whether there are attributes currently associated with the scope. Move the implementation of .scope_attributes? and .scope_attributes to ActiveRecord::Scoping because they don't particularly have to do specifically with Named scopes and their only dependency, in the case of .scope_attributes?, and only caller, in the case of .scope_attributes is contained in Scoping. | ||||
* | | | | | Use `def setup` instead of `setup do` | eileencodes | 2015-03-12 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | `setup do` creates unnecessary allocations of proc objects in callbacks. This prevents that from happening and results in faster code. | ||||
* | | | | | 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] | ||||
| * | | | | | 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 | ||||
| * | | | | | Require pg~>0.18 to ensure Ruby 2.2 compatibility | Matt Brictson | 2015-03-11 | 2 | -2/+7 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions of the pg gem earlier than 0.18.0 cannot be used safely with Ruby 2.2. Specifically, pg 0.17 when used with Ruby 2.2 has a known bug that causes random bits to be added to the end of strings. Further explanation here: https://bitbucket.org/ged/ruby-pg/issue/210/crazy-bytes-being-added-to-record | ||||
* | | | | | Merge pull request #16992 from square/configurable-job-queue-adapter | Jeremy Kemper | 2015-03-12 | 4 | -17/+82 |
|\ \ \ \ \ | |/ / / / |/| | | | | ActiveJob: queue_adapter can be inherited | ||||
| * | | | | `ActiveJob::Base#queue_adapter` is now a `class_attribute` | Tamir Duberstein | 2015-03-11 | 4 | -17/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows different `queue_adapters` to be used in each `ActiveJob` class heirarchy. Previously, all subclasses used a single global queue adapter. | ||||
* | | | | | Merge pull request #18459 from cantino/action_controller_guide_edits | Rafael Mendonça França | 2015-03-11 | 1 | -45/+44 |
|\ \ \ \ \ | |/ / / / |/| | | | | Action Controller guide edits for grammar and clarity | ||||
| * | | | | 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 | ||||
| * | | | | | `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 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces undesirable `Rails.logger` formatters (such as the syslog formatter) onto a `Logger.new(STDERR)` for the console. The production logger may be going elsewhere than standard io, so we can't presume to reuse its formatter. With syslog, this causes missing newlines in the console, so irb prompts start at the end of the last log message. We can work to expose the console formatter in another way to address the original issue. This reverts commit 026ce5ddf11c4cda0aae7f33a9266e54117db318, reversing changes made to 6f0a69c5899ebdc892e2aa23e68e2604fa70fb73. | ||||
* | | | | Merge pull request #19289 from ahmad-alkheat/master | Yves Senn | 2015-03-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Unnecessary usage of self in the guides [ci skip] |