aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MySQL: remove the old-school 'packets out of order' messageJeremy Kemper2013-12-171-6/+0
| | | | Blast from the past, MySQL 4 era, when the password hashing style changed.
* use `bin/spring` in release notes. [ci skip]Yves Senn2013-12-171-1/+1
| | | | | | | Follow up to: https://github.com/rails/rails/commit/828a8f214535e59d709fd4862605902d1cc21632#commitcomment-4879462 This will be available after https://github.com/jonleighton/spring/commit/c6e25804b3338959d87a29f40967a333c650c031 is released.
* Merge pull request #13332 from rails/pixeltrix/mail_viewGuillermo Iguaran2013-12-1621-26/+765
|\ | | | | WIP: Integration of mail_view gem
| * Add mailer previews feature based on mail_view gemAndrew White2013-12-1717-6/+736
| |
| * Add an application controller for internal controllersAndrew White2013-12-173-18/+23
| |
| * Fix method redefinition warningAndrew White2013-12-171-2/+6
|/
* Merge pull request #12873 from martinemde/fix-where-assoc-nilCarlos Antonio da Silva2013-12-163-3/+104
|\ | | | | Better support for AR:B.where(belongs_to_assoc: val) which previously generated invalid SQL
| * Better support for `where()` conditions that use an association name.Martin Emde2013-12-163-3/+104
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the name of an association in `where` previously worked only if the value was a single `ActiveRecrd::Base` object. e.g. Post.where(author: Author.first) Any other values, including `nil`, would cause invalid SQL to be generated. This change supports arguments in the `where` query conditions where the key is a `belongs_to` association name and the value is `nil`, an `Array` of `ActiveRecord::Base` objects, or an `ActiveRecord::Relation` object. # Given the Post model class Post < ActiveRecord::Base belongs_to :author end # nil value finds records where the association is not set Post.where(author: nil) # SELECT "posts".* FROM "posts" WHERE "posts"."author_id" IS NULL # Array values find records where the association foreign key # matches the ids of the passed ActiveRecord models, resulting # in the same query as Post.where(author_id: [1,2]) authors_array = [Author.find(1), Author.find(2)] Post.where(author: authors_array) # ActiveRecord::Relation values find records using the same # query as Post.where(author_id: Author.where(last_name: "Emde")) Post.where(author: Author.where(last_name: "Emde")) Polymorphic `belongs_to` associations will continue to be handled appropriately, with the polymorphic `association_type` field added to the query to match the base class of the value. This feature previously only worked when the value was a single `ActveRecord::Base`. class Post < ActiveRecord::Base belongs_to :author, polymorphic: true end Post.where(author: Author.where(last_name: "Emde")) # Generates a query similar to: Post.where(author_id: Author.where(last_name: "Emde"), author_type: "Author")
* Remove the link for code.whytheluckystiff.netRafael Mendonça França2013-12-161-1/+1
| | | | | This is not a valid URL. [ci skip]
* Merge pull request #13338 from shreve/patch-1Rafael Mendonça França2013-12-161-1/+1
|\ | | | | Fix url leak in application templates guide
| * Fix url leak in application templates guideJacob Evan Shreve2013-12-161-1/+1
|/ | | Encapsulate url that was including the trailing quote and colon.
* Merge pull request #13321 from mezis/fix-safebuffer-interpolation-masterJeremy Kemper2013-12-162-7/+37
|\ | | | | Fixes interpolation on SafeBuffer
| * Fixes interpolation on SafeBufferJulien Letessier2013-12-142-7/+37
| | | | | | | | | | | | | | | | | | Interpolation was untested and did not work with hash arguments. Adds - support for interpolation with hash argument - tests for the above - tests for safe/unsafe interpolation
* | Fix missing closing rdoc tag [ci skip]Carlos Antonio da Silva2013-12-161-1/+1
| |
* | Merge pull request #13328 from teohm/dbconsole_support_database_urlYves Senn2013-12-163-35/+76
|\ \ | | | | | | Fixed rails dbconsole to support DATABASE_URL
| * | fixed rails dbconsole to support ENV['DATABASE_URL'].Huiming Teo2013-12-163-35/+76
| | |
* | | Merge pull request #13333 from kia84/masterYves Senn2013-12-151-0/+1
|\ \ \ | | | | | | | | Added `absence` parameter to pluralization table [ci skip]
| * | | Added `absence` parameter to pluralization tableIvan2013-12-161-0/+1
|/ / / | | | | | | Added `absence` parameter to table in section `5.1.2 Error Message Interpolation`.
* | | Merge pull request #13307 from akshay-vishnoi/typoRafael Mendonça França2013-12-154-6/+6
|\ \ \ | | | | | | | | Spelling and Grammar check [ci skip]
| * | | Spelling and Grammar check [ci skip]Akshay Vishnoi2013-12-164-6/+6
| | | |
* | | | Improve CHANGELOG entry with examples [ci skip]Rafael Mendonça França2013-12-151-0/+10
| | | |
* | | | Merge pull request #13313 from ccutrer/temp-tablesRafael Mendonça França2013-12-158-17/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support creating temporary tables from queries Conflicts: activerecord/CHANGELOG.md
| * | | | support creating temporary tables from queriesCody Cutrer2013-12-148-17/+83
| | | | | | | | | | | | | | | | | | | | | | | | | also override drop_table in AbstractMySQLAdapter to properly drop temporary tables without committing the transaction
* | | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2013-12-151-3/+3
| | | | |
* | | | | Merge pull request #13312 from arthurnn/fix_db_task_reqRafael Mendonça França2013-12-153-5/+13
|\ \ \ \ \ | | | | | | | | | | | | db:test:clone and prepare must load environment
| * | | | | Regression test for load_structure and clone_structureArthur Neves2013-12-141-2/+4
| | | | | |
| * | | | | db:test:clone and prepare must load environmentArthur Neves2013-12-142-3/+9
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | db:test:clone and db:test:prepare use ActiveRecord::Base. configurations, so we need to load the rails environment, otherwise the config wont be in place.
* | | | | Merge pull request #13329 from robertomiranda/secret-token-docsGuillermo Iguaran2013-12-152-10/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | [ci-skip] Update secret_key_base Docs
| * | | | Update secret_key_base Docsrobertomiranda2013-12-152-10/+11
|/ / / /
* | | | Merge pull request #13181 from fluxusfrequency/patch-4Robin Dupret2013-12-141-221/+603
|\ \ \ \ | | | | | | | | | | Clarification, grammar fixes, punctuation, and capitalization [ci skip]
| * | | | Word wrapping engines guide [ci skip]Ben Lewis2013-12-141-189/+568
| | | | |
| * | | | Clarification, grammar fixes, punctuation, and capitalization [ci skip]Ben Lewis2013-12-141-84/+87
| | | | |
* | | | | Merge pull request #13325 from kuldeepaggarwal/docs-updateGuillermo Iguaran2013-12-144-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Improved documents [ci skip]
| * | | | | Improved documents [ci skip]Kuldeep Aggarwal2013-12-144-4/+4
|/ / / / /
* | | | | Merge pull request #13324 from fphilipe/fix-syntax-error-in-exampleRafael Mendonça França2013-12-141-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix syntax error in redirect_to example
| * | | | Fix syntax error in redirect_to examplePhilipe Fatio2013-12-141-1/+1
|/ / / / | | | | | | | | | | | | | | | | Without parenthesis, ruby assumes that curly braces denote the beginning of a block.
* | | | Merge pull request #13316 from JuanitoFatas/working-with-jsGodfrey Chan2013-12-141-5/+15
|\ \ \ \ | |_|/ / |/| | | Improve document: working with javascript in rails [ci skip].
| * | | Improve document: working with javascript in rails [ci skip].Juanito Fatas2013-12-141-5/+15
|/ / / | | | | | | | | | | | | | | | * Add form_tag generated output. * improve some text. * data-remote='true' should use double quotes.
* | | Fix typo [ci skip]Rafael Mendonça França2013-12-131-1/+1
| | |
* | | Merge pull request #13298 from rails/secret_tokensGuillermo Iguaran2013-12-138-15/+79
|\ \ \ | | | | | | | | Create config/secrets.yml file for store of tokens
| * | | Add comment about secret_key_base in secrets.ymlGuillermo Iguaran2013-12-131-0/+12
| | | |
| * | | Rename tokens.yml to secrets.ymlGuillermo Iguaran2013-12-125-6/+6
| | | |
| * | | Add test for custom tokens stored in config/tokens.ymlGuillermo Iguaran2013-12-121-0/+13
| | | |
| * | | Replace config.secret_key_base with secrets.secret_key_base in testGuillermo Iguaran2013-12-121-1/+1
| | | |
| * | | Load secret_key_base from tokens.yml, fallback to config.secret_key_baseGuillermo Iguaran2013-12-125-12/+54
| | | |
| * | | Remove secret_token.rbGuillermo Iguaran2013-12-121-12/+0
| | | |
| * | | Add config/tokens.yml templateGuillermo Iguaran2013-12-122-0/+9
| | | |
* | | | Merge pull request #13309 from arunagw/warning-fix-argumnetRafael Mendonça França2013-12-131-1/+1
|\ \ \ \ | | | | | | | | | | argument prefix warning removed
| * | | | argument prefix warning removedArun Agrawal2013-12-131-1/+1
|/ / / / | | | | | | | | | | | | * interpreted as a argument prefix
* | | | Merge pull request #13306 from kassio/masterRafael Mendonça França2013-12-132-4/+9
|\ \ \ \ | | | | | | | | | | Fix mysql to support duplicated column names
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 00:18:47 +0000