aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| * | | | Fix mysql to support duplicated column namesKassio Borges2013-12-132-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix the [broken test](https://github.com/rails/rails/commit/4a2650836680f51490e999c3c8441a2f9adff96e) `test_with_limiting_with_custom_select`. The query's result was built in a hash with column name as key, if the result have a duplicated column name the last value was overriding the first one.
* | | | | refactor, reuse assertions in range_test.rb.Yves Senn2013-12-131-186/+111
| | | | |
* | | | | extract PG range tests from datatype_test.rb into range_test.rbYves Senn2013-12-133-296/+321
|/ / / /
* | | | Merge pull request #13305 from psahni/form_tag_with_parametersYves Senn2013-12-131-1/+1
|\ \ \ \ | | | | | | | | | | form_tag with parameters fixed [ci skip]
| * | | | form_tag with parameters fixed [ ci skip ]Prashant Sahni2013-12-131-1/+1
| | | | |
* | | | | Merge pull request #13303 from dvsuresh/typo_postgresqlymlArun Agrawal2013-12-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Correct comment in databases/postgresql.yml [ci skip]
| * | | | | Correct comment in databases/postgresql.ymlDV Suresh2013-12-121-1/+1
| | | | | |
* | | | | | Add a bunch of Relation -> Array delegate methods to the whitelist. This ↵Jeremy Kemper2013-12-122-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | won't last - aim to switch back to a blacklist for mutator methods.
* | | | | | Perf: save ~9% of object allocations on heavy requests.Jeremy Kemper2013-12-121-2/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The per-thread registry is keyed on the class name, and each request for the class name returns a new string. This is in the hot path for a lot of Active Record behavior, so we easily accumulate thousands of repeated strings. To fix, we simply cache the key when the class is first extended with the module. TODO: Eliminate this module. The per-thread instance concept is common, but this technique confuses and obfuscates.
* | | | | Merge pull request #13302 from afshinator/masterLauro Caetano2013-12-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix grammatical error
| * | | | | fix grammatical errorAfshin Mokhtari2013-12-121-1/+1
| | | | | |
* | | | | | Merge pull request #12590 from laurocaetano/whitelist-to-delegate-array-methodsRafael Mendonça França2013-12-124-104/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | Create a whitelist of methods to be delegated to Array.
| * | | | | | Use `public_send` instead of just use `send`.Lauro Caetano2013-12-122-9/+9
| | | | | | |
| * | | | | | Use a whitelist to delegate methods to arrayLauro Caetano2013-12-122-75/+38
| | | | | | |
| * | | | | | Add changeloglaurocaetano2013-12-121-6/+15
| | | | | | |
| * | | | | | Remove delegation test.laurocaetano2013-12-121-17/+46
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This test was removed, since Relation will not delegate class methods to Array.
* | | | | | extract cache counter logic to one methodAaron Patterson2013-12-121-11/+10
| | | | | |
* | | | | | remove duplicate codeAaron Patterson2013-12-121-15/+6
| | | | | |
* | | | | | extract a method for updating without a record objectAaron Patterson2013-12-121-6/+10
| | | | | |
* | | | | | extract methods out of the cache update methodAaron Patterson2013-12-121-14/+22
| | | | | |
* | | | | | pull a nil check up one frameAaron Patterson2013-12-121-6/+10
|/ / / / /