aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ignore Byebug command history fileAkira Matsuda2015-12-181-0/+3
| | | | | This file is generated by a gem that is bundled by default in the generated Rails app, just like .sqlite3 files. Hence it might be natural to be ignored here rather than in each developer's .gitignore_global.
* Use released rackRafael Mendonça França2015-12-183-14/+3
|
* Merge pull request #22649 from derekprior/dp-redirect-back-docsKasper Timm Hansen2015-12-181-2/+8
|\ | | | | Document when fallback_location is used [ci-skip]
| * Document when fallback_location is used [ci-skip]Derek Prior2015-12-171-2/+8
| | | | | | | | | | | | | | | | If you're not familiar with how the `Referer` header works, you likely won't understand why you need to provide a fallback or under what circumstances it would be used. Hopefully this clarifies things a bit.
* | Merge pull request #22655 from akshay-vishnoi/fix-typosRafael França2015-12-181-1/+1
|\ \ | | | | | | Fix typo
| * | [ci skip] Fix typoAkshay Vishnoi2015-12-181-1/+1
|/ /
* | Install jquery-railsRafael Mendonça França2015-12-182-0/+6
| | | | | | | | | | It will make sure that the generated application in the tests get the gem.
* | Merge pull request #22653 from matthewd/find_array_orderedMatthew Draper2015-12-184-2/+100
|\ \ | | | | | | | | | ActiveRecord::Base#find(array) returning result in the same order as the array passed
| * | Implement limit & offset for ourselvesMatthew Draper2015-12-182-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We know the query will return exactly one row for each entry in the `ids` array, so we can do all the limit/offset calculations on that array, in advance. I also split our new ordered-ids behaviour out of the existing `find_some` method: especially with this change, the conditionals were overwhelming the actual logic.
| * | Adding a new test using chained where, limit and find([pks])Miguel Grazziotin2015-08-071-2/+12
| | |
| * | using order_values method instead of relying on ActiveRecord::Relation ↵Miguel Grazziotin2015-06-191-2/+2
| | | | | | | | | | | | @values hash
| * | WIP: fixing the limit bug and introducing new tests (failing for now) on ↵Miguel Grazziotin2015-06-192-7/+30
| | | | | | | | | | | | .find(array) with offset
| * | do not change the order of the result if the object was already ordered by ↵Miguel Grazziotin2015-06-052-0/+6
| | | | | | | | | | | | the user via :order clause
| * | adding a test to ensure the find is obbeying the limitMiguel Grazziotin2015-06-031-0/+7
| | |
| * | [#20338] adding tests to ensure the order clause takes precedenceMiguel Grazziotin2015-06-031-0/+18
| | |
| * | [#20338] improving implementation, fixing and adding some more specsMiguel Grazziotin2015-06-032-6/+4
| | |
| * | [#20338] WIP: first basic implementation and specsMiguel Grazziotin2015-05-292-1/+17
| | |
* | | These limits are now implicitMatthew Draper2015-12-182-2/+2
| | |
* | | Merge pull request #20815 from ↵Matthew Draper2015-12-183-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | byroot/do-not-include-column-limit-if-it-is-default Do not include column limit in schema.rb if it matches the default
| * | | Do not include column limit in schema.rb if it matches the defaultJean Boussier2015-07-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When working on engines that supports multiple databases, it's very annoying to have a different schema.rb output based on which database you use. MySQL being the primary offender. This patch should reduce the disparities a bit.
* | | | Merge pull request #21914 from zachalewel/zachalewel-patch-1Matthew Draper2015-12-181-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | Update CHANGELOG.md for readability
| * | | | Update CHANGELOG.mdZach Alewel2015-10-081-1/+1
| | | | |
| * | | | Update CHANGELOG.md for readabilityZach Alewel2015-10-081-1/+1
| | | | |
* | | | | Merge pull request #22623 from greysteil/support-passing-schema-name-to-indexesMatthew Draper2015-12-183-9/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Support passing the schema name prefix to `conenction.indexes`
| * | | | | Support passing the schema name prefix to `conenction.indexes`Grey Baker2015-12-173-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support passing the schema name as a prefix to table name in `ConnectionAdapters::SchemaStatements#indexes`. Previously the prefix would be considered a full part of the index name, and only the schema in the current search path would be considered.
* | | | | | Merge pull request #19456 from greysteil/index-exists-behaviourMatthew Draper2015-12-187-20/+126
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ignore index name in `index_exists?` when not passed a name to check for
| * | | | | | Support removing custom-names indexes when only specifying column namesGrey Baker2015-12-156-18/+107
| | | | | | |
| * | | | | | Ignore index name in `index_exists?` when not passed a name to check forGrey Baker2015-12-154-2/+19
| | | | | | |
* | | | | | | Merge pull request #22642 from seuros/remove-mysql-adapterMatthew Draper2015-12-1855-1732/+64
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | Remove legacy mysql adapter
| * | | | | | Remove legacy mysql adapterAbdelkader Boudih2015-12-1754-1732/+59
| | | | | | |
* | | | | | | Use released GlobalID now that it provides URI::GID::MissingModelIdError for ↵Jeremy Daer2015-12-173-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Job
* | | | | | | Merge pull request #22639 from arunagw/aa-remove-few-warnings-actioncableGuillermo Iguaran2015-12-177-6/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove warnings from actioncable test
| * | | | | | | Remove warnings from actioncableArun Agrawal2015-12-177-6/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Warnings coming from code and test are removed
* | | | | | | Merge pull request #22646 from maclover7/masterGuillermo Iguaran2015-12-172-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Require Nokogiri >= 1.6.7.1
| * | | | | | | Require Nokogiri >= 1.6.7.1Jon Moss2015-12-172-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Many CVEs released: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
* | | | | | | Merge pull request #22645 from kaspth/parameters-only-deep-dup-hash-arrayMatthew Draper2015-12-182-2/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Only dup Ruby's Hash and Array.
| * | | | | | | Only dup Ruby's Hash and Array.Kasper Timm Hansen2015-12-172-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling `to_h` on an `ActionController::Parameters` instance it would `deep_dup` its internal parameters. This inadvertently called `dup` on a passed Active Record model which would create new models. Fix by only dupping Ruby's Arrays and Hashes.
* | | | | | | | Should also stub the received callbackDavid Heinemeier Hansson2015-12-171-0/+3
| | | | | | | |
* | | | | | | | Don't log Action Cable to STDOUT in developmenteileencodes2015-12-172-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging Action Cable to STDOUT caused the development log to see double messages like this: ``` Started GET "/" for ::1 at 2015-12-17 15:21:34 -0500 Started GET "/" for ::1 at 2015-12-17 15:21:34 -0500 Processing by Rails::WelcomeController#index as HTML Processing by Rails::WelcomeController#index as HTML Rendered /welcome/index.html.erb (0.0ms) Rendered /welcome/index.html.erb (0.0ms) Completed 200 OK in 3ms (Views: 1.3ms | ActiveRecord: 0.0ms) Completed 200 OK in 3ms (Views: 1.3ms | ActiveRecord: 0.0ms) ``` Now that Action Cable is part of Rails it doesn't need it's own logger and will log to STDOUT via the local dev server here: https://github.com/rails/rails/blob/master/railties/lib/rails/commands/server.rb
* | | | | | | | Use release sprockets-railsRafael Mendonça França2015-12-173-17/+7
| | | | | | | |
* | | | | | | | Use released jquery-railsRafael Mendonça França2015-12-172-12/+0
| | | | | | | |
* | | | | | | | Merge pull request #22627 from rails/application-mailer-by-defaultRafael França2015-12-1713-46/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | ApplicationMailer should be generated by default just like every other Application* parent
| * | | | | | | | ApplicationMailer should be generated by default just like every other ↵David Heinemeier Hansson2015-12-1712-45/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Application* parent
| * | | | | | | | Fix warningRafael Mendonça França2015-12-171-1/+1
| | | | | | | | |
* | | | | | | | | Use released arelRafael Mendonça França2015-12-174-12/+3
| |/ / / / / / / |/| | | | | | |
* | | | | | | | [ci skip] Add `Thread.current` to match internalsKasper Timm Hansen2015-12-171-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We call the thread variable accessors on `Thread.current`, which matches Ruby's documentation: http://ruby-doc.org/core-2.2.0/Thread.html#method-i-thread_variable_get Fix these to stay `current` ( ͡° ͜ʖ ͡°)
* | | | | | | Use released mail gemRafael Mendonça França2015-12-172-10/+2
| | | | | | |
* | | | | | | Merge pull request #22644 from erickrause/expanding_has_many_through_docRafael França2015-12-171-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Expanding the documentation for collection=objects [ci-skip]
| * | | | | | | Expanding the documentation for collection=objects for has_many :through ↵Eric Krause2015-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci-skip]
* | | | | | | | Merge pull request #22643 from Gaurav2728/gaurav-correct_doc_in_action_cableRafael França2015-12-171-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | traditional make sense with `<tt>ActiveSupport::TaggedLogging</tt>`