| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Improve document: working with javascript in rails [ci skip]. | Juanito Fatas | 2013-12-14 | 1 | -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ça | 2013-12-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #13298 from rails/secret_tokens | Guillermo Iguaran | 2013-12-13 | 8 | -15/+79 | |
| |\ \ \ | | | | | | | | | Create config/secrets.yml file for store of tokens | |||||
| | * | | | Add comment about secret_key_base in secrets.yml | Guillermo Iguaran | 2013-12-13 | 1 | -0/+12 | |
| | | | | | ||||||
| | * | | | Rename tokens.yml to secrets.yml | Guillermo Iguaran | 2013-12-12 | 5 | -6/+6 | |
| | | | | | ||||||
| | * | | | Add test for custom tokens stored in config/tokens.yml | Guillermo Iguaran | 2013-12-12 | 1 | -0/+13 | |
| | | | | | ||||||
| | * | | | Replace config.secret_key_base with secrets.secret_key_base in test | Guillermo Iguaran | 2013-12-12 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Load secret_key_base from tokens.yml, fallback to config.secret_key_base | Guillermo Iguaran | 2013-12-12 | 5 | -12/+54 | |
| | | | | | ||||||
| | * | | | Remove secret_token.rb | Guillermo Iguaran | 2013-12-12 | 1 | -12/+0 | |
| | | | | | ||||||
| | * | | | Add config/tokens.yml template | Guillermo Iguaran | 2013-12-12 | 2 | -0/+9 | |
| | | | | | ||||||
| * | | | | Merge pull request #13309 from arunagw/warning-fix-argumnet | Rafael Mendonça França | 2013-12-13 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | argument prefix warning removed | |||||
| | * | | | | argument prefix warning removed | Arun Agrawal | 2013-12-13 | 1 | -1/+1 | |
| |/ / / / | | | | | | | | | | | | | * interpreted as a argument prefix | |||||
| * | | | | Merge pull request #13306 from kassio/master | Rafael Mendonça França | 2013-12-13 | 2 | -4/+9 | |
| |\ \ \ \ | | | | | | | | | | | Fix mysql to support duplicated column names | |||||
| | * | | | | Fix mysql to support duplicated column names | Kassio Borges | 2013-12-13 | 2 | -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 Senn | 2013-12-13 | 1 | -186/+111 | |
| | | | | | | ||||||
| * | | | | | extract PG range tests from datatype_test.rb into range_test.rb | Yves Senn | 2013-12-13 | 3 | -296/+321 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #13305 from psahni/form_tag_with_parameters | Yves Senn | 2013-12-13 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | form_tag with parameters fixed [ci skip] | |||||
| | * | | | | form_tag with parameters fixed [ ci skip ] | Prashant Sahni | 2013-12-13 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #13303 from dvsuresh/typo_postgresqlyml | Arun Agrawal | 2013-12-12 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Correct comment in databases/postgresql.yml [ci skip] | |||||
| | * | | | | | Correct comment in databases/postgresql.yml | DV Suresh | 2013-12-12 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Add a bunch of Relation -> Array delegate methods to the whitelist. This ↵ | Jeremy Kemper | 2013-12-12 | 2 | -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 Kemper | 2013-12-12 | 1 | -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/master | Lauro Caetano | 2013-12-12 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | fix grammatical error | |||||
| | * | | | | | fix grammatical error | Afshin Mokhtari | 2013-12-12 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #12590 from laurocaetano/whitelist-to-delegate-array-methods | Rafael Mendonça França | 2013-12-12 | 4 | -104/+105 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Create a whitelist of methods to be delegated to Array. | |||||
| | * | | | | | | Use `public_send` instead of just use `send`. | Lauro Caetano | 2013-12-12 | 2 | -9/+9 | |
| | | | | | | | | ||||||
| | * | | | | | | Use a whitelist to delegate methods to array | Lauro Caetano | 2013-12-12 | 2 | -75/+38 | |
| | | | | | | | | ||||||
| | * | | | | | | Add changelog | laurocaetano | 2013-12-12 | 1 | -6/+15 | |
| | | | | | | | | ||||||
| | * | | | | | | Remove delegation test. | laurocaetano | 2013-12-12 | 1 | -17/+46 | |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | This test was removed, since Relation will not delegate class methods to Array. | |||||
| * | | | | | | extract cache counter logic to one method | Aaron Patterson | 2013-12-12 | 1 | -11/+10 | |
| | | | | | | | ||||||
| * | | | | | | remove duplicate code | Aaron Patterson | 2013-12-12 | 1 | -15/+6 | |
| | | | | | | | ||||||
| * | | | | | | extract a method for updating without a record object | Aaron Patterson | 2013-12-12 | 1 | -6/+10 | |
| | | | | | | | ||||||
| * | | | | | | extract methods out of the cache update method | Aaron Patterson | 2013-12-12 | 1 | -14/+22 | |
| | | | | | | | ||||||
| * | | | | | | pull a nil check up one frame | Aaron Patterson | 2013-12-12 | 1 | -6/+10 | |
| |/ / / / / | ||||||
| * | | | | | docs guidelines: recommends wording in a way that avoids "you"s and "your"s | Xavier Noria | 2013-12-12 | 1 | -1/+15 | |
| | | | | | | ||||||
| * | | | | | copy-edits 68abbac [ci skip] | Xavier Noria | 2013-12-12 | 1 | -10/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rewording to avoid "you"s. * Suggest as first natural alternative to refactor the block to evaluate to the returned value. * Removes the quotes around "filters", since that is a common work in our jargon. | |||||
| * | | | | | Merge pull request #13255 from strzalek/bump-builder | Rafael Mendonça França | 2013-12-12 | 2 | -2/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Bump up builder | |||||
| | * | | | | | More liberal builder dependency | Łukasz Strzałkowski | 2013-12-12 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Allowing us to get 3.2.x versions if needed. | |||||
| * | | | | | | Merge pull request #13300 from chancancode/add_nodoc_am_dirty_methods | Aaron Patterson | 2013-12-12 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Added :nodoc: for `attribute_changed?` and `attribute_was` [ci skip] | |||||
| | * | | | | | Added :nodoc: for `attribute_changed?` and `attribute_was` [ci skip] | Godfrey Chan | 2013-12-12 | 1 | -2/+2 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | These methods were made "public" in 47617ecd so that `method_missing` can invoke them without going through `send`, but they aren't meant for consumption from outside of Rails. | |||||
| * | | | | | remove more nil checks | Aaron Patterson | 2013-12-12 | 1 | -6/+5 | |
| | | | | | | ||||||
| * | | | | | remove nil check | Aaron Patterson | 2013-12-12 | 2 | -7/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | calling replace_keys could possibly do a nil check twice, this commit reduces it to once. | |||||
| * | | | | | remove the nil check from set_inverse_instance | Aaron Patterson | 2013-12-12 | 4 | -4/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | methods that call set_inverse_instance with a record will not have to pay the cost of a nil check on every call | |||||
| * | | | | | make sure cached table name is a string. fixes #12582 | Aaron Patterson | 2013-12-12 | 3 | -1/+12 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #13229 from vipulnsward/fix-10635-tests | Rafael Mendonça França | 2013-12-12 | 2 | -2/+17 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix test-error introduced by #10635. | |||||
| | * | | | | | PR #10635 introduces rescue from ArgumentError thrown by ↵ | Vipul A M | 2013-12-12 | 2 | -2/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Base64.strict_decode64`. This broke natural order of things for `StaleSessionCheck#stale_session_check!` which tried auto_loading a class based on `ArgumentError` message , and later retrying the `Marshal#load` of class, successfully allowing auto_loading. This PR tries to fix this behavior by forwarding `ArgumentError` 's not raised by `Base64.strict_decode64` , as is, ahead to `StaleSessionCheck#stale_session_check!` | |||||
| * | | | | | | Merge pull request #13293 from akshay-vishnoi/typo | Carlos Antonio da Silva | 2013-12-12 | 8 | -12/+12 | |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | Spelling and Grammar checks [ci skip] | |||||
| | * | | | | | Spelling and Grammar checks | Akshay Vishnoi | 2013-12-12 | 8 | -12/+12 | |
| | | |_|/ / | |/| | | | ||||||
| * | | | | | Merge pull request #13271 from ↵ | Rafael Mendonça França | 2013-12-12 | 1 | -0/+33 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | chancancode/warn_about_using_return_in_as_callbacks Warn about using `return` inside inline callback blocks [ci skip] | |||||
| | * | | | | | Warn about using `return` inside inline callback blocks [ci skip] | Godfrey Chan | 2013-12-11 | 1 | -0/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12981 | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |