aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Deleting unused fixturesThiago Pradi2015-03-142-10/+0
|
* Merge pull request #19335 from JahBrewski/masterArthur Nogueira Neves2015-03-141-1/+1
|\ | | | | [ci skip] Subject-verb agreement
| * [ci skip] Subject-verb agreementJoel Brewer2015-03-141-1/+1
|/
* Fix before_commit when updating a record on the callbackArthur Neves2015-03-142-23/+44
|
* Merge pull request #19322 from ↵Rafael Mendonça França2015-03-131-1/+1
|\ | | | | | | | | AndrewHendrie/AndrewHendrie-guides-testing-partials-patch Asserting partials modification
| * Asserting partials modificationAndrew Hendrie2015-03-131-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_initializerRafael Mendonça França2015-03-133-0/+14
|\ \ | | | | | | Add `rake initializer`
| * | Add `rake initializer`Naoto Kaneko2015-03-143-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 translationsChristian Ress2015-03-131-1/+1
| | | | | | | | | | | | Closes #19321. [ci skip]
* | | Merge pull request #19291 from hired/return-truthy-value-from-headRafael Mendonça França2015-03-132-0/+13
|\ \ \ | | | | | | | | Return truthy value from head method
| * | | Return true from head methodJoel Hayhurst2015-03-122-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-lookupRafael Mendonça França2015-03-132-5/+9
|\ \ \ \ | | | | | | | | | | `QueueAdapters` now does lazy lookup
| * | | | `QueueAdapters` does the lookupTamir Duberstein2015-03-122-5/+9
| | | | |
* | | | | Merge pull request #19315 from josh/update-sprockets-linksRafael Mendonça França2015-03-136-10/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | Update sprockets links to point to rails org
| * | | | Update sprockets links to point to rails orgJoshua Peek2015-03-136-10/+10
|/ / / /
* | | | Merge pull request #19317 from kuldeepaggarwal/doc-select-tag-outputAbdelkader Boudih2015-03-131-15/+15
|\ \ \ \ | | | | | | | | | | [ci skip] correct output of select
| * | | | [ci skip] correct output of selectKuldeep Aggarwal2015-03-131-15/+15
|/ / / /
* | | | Merge pull request #19313 from akshay-vishnoi/options-docsRafael Mendonça França2015-03-121-5/+5
|\ \ \ \ | | | | | | | | | | [CI SKIP] Correct output of options_for_select
| * | | | [CI SKIP] Correct output of options_for_selectAkshay Vishnoi2015-03-131-5/+5
|/ / / /
* | | | Merge pull request #19312 from mariusbutuc/fix-mailer-testing-typoRafael Mendonça França2015-03-121-1/+1
|\ \ \ \ | |/ / / |/| | | Fix typo in the Testing Your Mailers docs
| * | | Fix typo in the “Testing Your Mailers” docsMarius Butuc2015-03-121-1/+1
|/ / / | | | | | | * [ci skip]
* | | Merge pull request #19309 from f1sherman/dont-set-session-options-idGuillermo Iguaran2015-03-125-13/+5
|\ \ \ | | | | | | | | Use request.session.id instead of request.session_options[:id]
| * | | Use request.session.id instead of request.session_options[:id]Brian John2015-03-125-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-getArthur Nogueira Neves2015-03-121-1/+1
|\ \ \ | | | | | | | | Use a more conservative `const_get` over `constantize`
| * | | Use a more conservative `const_get` over `constantize`Tamir Duberstein2015-03-121-1/+1
| | | |
* | | | Merge pull request #19271 from eagletmt/304-content-typeArthur Nogueira Neves2015-03-122-0/+13
|\ \ \ \ | |/ / / |/| | | 304 response should not include Content-Type header
| * | | Also skip Content-Encoding and Vary header if 304Kohei Suzuki2015-03-122-4/+6
| | | |
| * | | 304 response should not include Content-Type headerKohei Suzuki2015-03-102-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_noteAbdelkader Boudih2015-03-121-1/+4
|\ \ \ \ | | | | | | | | | | [ci skip] Take NOTE: as paragraph to make NOTE block
| * | | | [ci skip] Take NOTE: as paragraph to make NOTE blockyui-knk2015-03-121-1/+4
|/ / / /
* | | | Merge pull request #19301 from Empact/default-scopesCarlos Antonio da Silva2015-03-126-19/+20
|\ \ \ \ | | | | | | | | | | Isolate access to .default_scopes in ActiveRecord::Scoping::Default
| * | | | Isolate access to .default_scopes in ActiveRecord::Scoping::DefaultBen Woosley2015-03-126-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`eileencodes2015-03-121-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_docAbdelkader Boudih2015-03-121-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.yaginuma2015-03-121-9/+11
|/ / / / /
* | | | | Merge pull request #19299 from mattbrictson/pg-ruby-22Yves Senn2015-03-122-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Require pg ~> 0.18 to ensure Ruby 2.2 compatibility
| * | | | | Require pg~>0.18 to ensure Ruby 2.2 compatibilityMatt Brictson2015-03-112-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-adapterJeremy Kemper2015-03-124-17/+82
|\ \ \ \ \ | |/ / / / |/| | | | ActiveJob: queue_adapter can be inherited
| * | | | `ActiveJob::Base#queue_adapter` is now a `class_attribute`Tamir Duberstein2015-03-114-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_editsRafael Mendonça França2015-03-111-45/+44
|\ \ \ \ \ | |/ / / / |/| | | | Action Controller guide edits for grammar and clarity
| * | | | Edits for grammar and clarity, with help from georgeclaghorn and robin850.Andrew Cantino2015-03-111-45/+44
| | | | |
* | | | | Merge pull request #19295 from square/aj-instancesJeremy Kemper2015-03-1119-153/+174
|\ \ \ \ \ | | | | | | | | | | | | `ActiveJob::QueueAdapters::*` are no longer singletons
| * | | | | `ActiveJob::QueueAdapters::*` are no longer singletonsTamir Duberstein2015-03-1118-152/+173
| | | | | |
| * | | | | Fix naming collisionTamir Duberstein2015-03-111-1/+1
| | |_|/ / | |/| | |
* / | | | Revert "Merge pull request #15476 from JacobEvelyn/master"Jeremy Kemper2015-03-112-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/masterYves Senn2015-03-111-1/+1
|\ \ \ \ | | | | | | | | | | Unnecessary usage of self in the guides [ci skip]
| * | | | Unnecessary usage of self in the guidesAhmad Al-kheat2015-03-111-1/+1
| | | | | | | | | | | | | | | I deleted self from the callbacks guides code example because it's unnecessary and this way it's more like the other examples where self was not used.
* | | | | Merge pull request #19288 from yui-knk/fix/routingAbdelkader Boudih2015-03-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Change to code element
| * | | | | [ci skip] Change to code elementyui-knk2015-03-111-1/+1
|/ / / / /
* | | | | pg, `disable_referential_integrity` only catches AR errors.Yves Senn2015-03-112-3/+25
| | | | | | | | | | | | | | | | | | | | This change was prompted by 598b841.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 12:13:43 +0000