Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use cache/assets instead. | José Valim | 2011-07-12 | 4 | -5/+4 |
| | |||||
* | assets.cache_store now defaults to filesystem. You will want to share ↵ | José Valim | 2011-07-12 | 6 | -16/+9 |
| | | | | tmp/assets_cache between deploys. | ||||
* | Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patch | Santiago Pastorino | 2011-07-12 | 1 | -7/+13 |
|\ | | | | | Fix for SqlBypass session store (for master) | ||||
| * | Fix for SqlBypass session store | Joseph Wong | 2011-07-12 | 1 | -7/+13 |
| | | | | | | | | | | | | | | | | | | | | Two issues fixed: 1) connection_pool is not defined - needed by SessionStore#drop_table! and create_table! since c94651f 2) initialization of connection to the default of AR::Base.connection only occurred at the singleton level - the instance level method defined by cattr_accessor did not have this logic | ||||
* | | Merge pull request #2041 from SAP-Oxygen/master-session-id-patch-with-test | Santiago Pastorino | 2011-07-12 | 2 | -2/+37 |
|\ \ | | | | | | | Fixed session ID fixation for ActiveRecord::SessionStore (for master) | ||||
| * | | Fixed session ID fixation for ActiveRecord::SessionStore | Joseph Wong | 2011-07-12 | 2 | -2/+37 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have found that Rails will take an invalid session ID specified by the client and materialize a session based on that session ID. This means that it is possible, among other things, for a client to use an arbitrarily weak session ID or for a client to resurrect a previous used session ID. In other words, we cannot guarantee that all session IDs are generated by the server and that they are (statistically) unique through time. The fix is to always generate a new session ID in #get_session if an existing session cannot be found under the incoming session ID. Also added new tests that make sure that an invalid session ID is never materialized into a new session, regardless of whether it comes in via a cookie or a URL parameter (when :cookie_only => false). | ||||
* | | Merge pull request #2038 from FLOChip/extra_space | José Valim | 2011-07-12 | 2 | -4/+4 |
|\ \ | |/ |/| | remove extra space since comment_if already returns the space. | ||||
| * | remove extra space since comment_if already returns the space. | Teng Siong Ong | 2011-07-13 | 2 | -4/+4 |
|/ | |||||
* | Fix failure in test_preserves_existing_fixture_data from ↵ | Jon Leighton | 2011-07-12 | 1 | -2/+2 |
| | | | | test/cases/fixtures_test.rb when UTC and local time occur on different dates. | ||||
* | Fix exception if old and new targets are both nil. Fixes #1471. | Jon Leighton | 2011-07-12 | 4 | -2/+15 |
| | |||||
* | Ensure Dir.glob is sorted | Joshua Peek | 2011-07-11 | 1 | -1/+1 |
| | |||||
* | Generate valid default fixtures for models with a type column | Marc-Andre Lafortune | 2011-07-11 | 2 | -1/+6 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Merge pull request #1722 from AndrewRadev/grouped-select | José Valim | 2011-07-11 | 2 | -2/+48 |
|\ | | | | | Make "select" helper handle nested collections | ||||
| * | Grouped select helper | Andrew Radev | 2011-07-11 | 2 | -2/+48 |
| | | | | | | | | FormBuilder#select now works with a nested data structure. | ||||
* | | Merge pull request #1756 from shtirlic/xmlschema_fix | José Valim | 2011-07-11 | 2 | -1/+8 |
|\ \ | |/ |/| | Fix xmlschema output with fraction_digits >0 | ||||
| * | Fix xmlschema output with fraction_digits >0 | shtirlic | 2011-07-11 | 2 | -1/+8 |
| | | | | | | | | | | Current implementation produce incorrect output when Time#usec returns integer < 100000, because to_s doesn't add leading zeros. | ||||
* | | Merge pull request #2032 from dziulius/master | Xavier Noria | 2011-07-11 | 1 | -1/+1 |
|\ \ | | | | | | | #many? - uses count instead of select | ||||
| * | | #many? uses count instead of select - a bit faster | Julius Markūnas | 2011-07-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2009 from vatrai/autoload-todo-new | José Valim | 2011-07-11 | 8 | -15/+7 |
|\ \ \ | | | | | | | | | TODO fix explicitly loading exceptations, autoload removed | ||||
| * | | | TODO fix explicitly loading exceptations, autoload removed | Vishnu Atrai | 2011-07-11 | 8 | -15/+7 |
| | | | | |||||
* | | | | Require assets in all environments by default and provide a way to opt-out ↵ | José Valim | 2011-07-11 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | from uglifier. | ||||
* | | | | Merge pull request #2029 from sikachu/acronym_mention | José Valim | 2011-07-11 | 1 | -0/+5 |
|\ \ \ \ | |_|_|/ |/| | | | Mention about acronym inflection in config/initializers/inflections.rb | ||||
| * | | | Mention about acronym inflection in config/initializers/inflections.rb | Prem Sichanugrist | 2011-07-11 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | Closes #1366 | ||||
* | | | | Merge pull request #1929 from sobrinho/master | Santiago Pastorino | 2011-07-11 | 1 | -0/+14 |
|\ \ \ \ | | | | | | | | | | | Create a test case for disable_referential_integrity | ||||
| * | | | | Create a test case for disable_referential_integrity | Gabriel Sobrinho | 2011-07-01 | 1 | -0/+14 |
| | | | | | |||||
* | | | | | Merge pull request #1608 from sishen/sishen | José Valim | 2011-07-11 | 2 | -1/+25 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | MemcacheStore: deserialize the entry reading from local_cache when using | ||||
| * | | | | MemcacheStore: deserialize the entry reading from local_cache when using raw | Dingding Ye | 2011-06-10 | 2 | -1/+25 |
| | | | | | |||||
* | | | | | Merge pull request #1296 from c42engineering/issue636 | José Valim | 2011-07-11 | 2 | -1/+50 |
|\ \ \ \ \ | | | | | | | | | | | | | Resubmitting issue #636 as a pull request | ||||
| * | | | | | Issue #636 - Parsing an xml file with multiple records and extra attributes ↵ | Sidu Ponnappa | 2011-07-11 | 2 | -1/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | (besides type) fails | ||||
* | | | | | | Merge pull request #1924 from cesario/1922-get-back-and-deprecate-env-default | José Valim | 2011-07-11 | 2 | -0/+18 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Put back Rails.application#env_default and deprecate it [Closes #1922] | ||||
| * | | | | | Rails.application#env_config is now public API. [Closes #1924] | Franck Verrot | 2011-07-11 | 2 | -0/+18 |
|/ / / / / | |||||
* | | | | | Merge pull request #1823 from gnarg/master | Santiago Pastorino | 2011-07-10 | 2 | -2/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Log instrumentation name for exists? queries | ||||
| * | | | | | Log instrumentation name for exists? queries | Jon Guymon | 2011-06-22 | 2 | -2/+10 |
| | | | | | | |||||
* | | | | | | Make Rails.groups accept arrays. | José Valim | 2011-07-10 | 2 | -4/+7 |
| | | | | | | |||||
* | | | | | | Merge pull request #2026 from spohlenz/asset-tag-fix | José Valim | 2011-07-10 | 1 | -0/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Include TagHelper within AssetTagHelper | ||||
| * | | | | | | Include TagHelper within AssetTagHelper | Sam Pohlenz | 2011-07-10 | 1 | -0/+2 |
|/ / / / / / | |||||
* | | | | | | to_key on a destroyed model should return nil | Santiago Pastorino | 2011-07-09 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #2007 from amatsuda/having_vargs_nomethoderror_fix | Santiago Pastorino | 2011-07-09 | 2 | -8/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | having() raises NoMethodError: undefined method `empty?' when the given argument does not respond to empty? | ||||
| * | | | | | | formats | Akira Matsuda | 2011-07-09 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | fix AR having() not to raise NoMethodError when the given argument does not ↵ | Akira Matsuda | 2011-07-09 | 2 | -3/+10 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | respond to empty? having raises NoMethodError: undefined method `empty?' when a Fixnum or Date/Time were passed via varargs | ||||
* | | | | | | Foo.joins(:bar).includes(:bar) should result in a single query with :bar as ↵ | Jon Leighton | 2011-07-09 | 2 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | a join. Related: #1873. | ||||
* | | | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-09 | 14 | -63/+86 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add section about debugging assets | Ryan Bigg | 2011-07-09 | 1 | -1/+25 |
| | | | | | | | |||||
| * | | | | | | Clarify that per-controller asset files are not 'magically' loaded by the ↵ | Ryan Bigg | 2011-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller, but rather need to be required | ||||
| * | | | | | | Merge pull request #51 from christopherscott/master | Christopher Scott Hernandez | 2011-07-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Single word change (find -> where) on active record query page | ||||
| | * | | | | | | Updated active_record_querying.textile: intro paragraph of 'Conditions' to ↵ | Christopher Scott Hernandez | 2011-07-08 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | change 'find method' to 'where method' | ||||
| * | | | | | | update Rails version. (rails console didn't exist in 2.1) | Vijay Dev | 2011-07-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Changed the value that log_level takes to match the examples in the ↵ | Oge Nnadi | 2011-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | paragraph above | ||||
| * | | | | | | minor document edit | Akira Matsuda | 2011-07-08 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | the sample model has only 9 lines: https://github.com/lifo/docrails/commit/4d4819fb279386570466b2f99254cd77fb71e05c#commitcomment-467295 | ||||
| * | | | | | | :conditions => where | Akira Matsuda | 2011-07-08 | 3 | -18/+11 |
| | | | | | | |