aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2066 from amatsuda/magicomeAaron Patterson2011-07-142-0/+4
|\ | | | | missing magic comments
| * need magic commentsAkira Matsuda2011-07-142-0/+4
|/
* Merge pull request #2052 from amatsuda/fullwidth_blankAaron Patterson2011-07-132-2/+6
|\ | | | | treat fullwidth whitespace as a blank character
| * treat fullwidth whitespace as a blank characterAkira Matsuda2011-07-142-2/+6
| |
* | Bump rack upSantiago Pastorino2011-07-131-1/+1
|/
* Use cache/assets instead.José Valim2011-07-124-5/+4
|
* assets.cache_store now defaults to filesystem. You will want to share ↵José Valim2011-07-126-16/+9
| | | | tmp/assets_cache between deploys.
* Merge pull request #2042 from SAP-Oxygen/master-sqlbypass-patchSantiago Pastorino2011-07-121-7/+13
|\ | | | | Fix for SqlBypass session store (for master)
| * Fix for SqlBypass session storeJoseph Wong2011-07-121-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-testSantiago Pastorino2011-07-122-2/+37
|\ \ | | | | | | Fixed session ID fixation for ActiveRecord::SessionStore (for master)
| * | Fixed session ID fixation for ActiveRecord::SessionStoreJoseph Wong2011-07-122-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_spaceJosé Valim2011-07-122-4/+4
|\ \ | |/ |/| remove extra space since comment_if already returns the space.
| * remove extra space since comment_if already returns the space.Teng Siong Ong2011-07-132-4/+4
|/
* Fix failure in test_preserves_existing_fixture_data from ↵Jon Leighton2011-07-121-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 Leighton2011-07-124-2/+15
|
* Ensure Dir.glob is sortedJoshua Peek2011-07-111-1/+1
|
* Generate valid default fixtures for models with a type columnMarc-Andre Lafortune2011-07-112-1/+6
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Merge pull request #1722 from AndrewRadev/grouped-selectJosé Valim2011-07-112-2/+48
|\ | | | | Make "select" helper handle nested collections
| * Grouped select helperAndrew Radev2011-07-112-2/+48
| | | | | | | | FormBuilder#select now works with a nested data structure.
* | Merge pull request #1756 from shtirlic/xmlschema_fixJosé Valim2011-07-112-1/+8
|\ \ | |/ |/| Fix xmlschema output with fraction_digits >0
| * Fix xmlschema output with fraction_digits >0shtirlic2011-07-112-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/masterXavier Noria2011-07-111-1/+1
|\ \ | | | | | | #many? - uses count instead of select
| * | #many? uses count instead of select - a bit fasterJulius Markūnas2011-07-111-1/+1
| | |
* | | Merge pull request #2009 from vatrai/autoload-todo-newJosé Valim2011-07-118-15/+7
|\ \ \ | | | | | | | | TODO fix explicitly loading exceptations, autoload removed
| * | | TODO fix explicitly loading exceptations, autoload removedVishnu Atrai2011-07-118-15/+7
| | | |
* | | | Require assets in all environments by default and provide a way to opt-out ↵José Valim2011-07-112-3/+8
| | | | | | | | | | | | | | | | from uglifier.
* | | | Merge pull request #2029 from sikachu/acronym_mentionJosé Valim2011-07-111-0/+5
|\ \ \ \ | |_|_|/ |/| | | Mention about acronym inflection in config/initializers/inflections.rb
| * | | Mention about acronym inflection in config/initializers/inflections.rbPrem Sichanugrist2011-07-111-0/+5
| | | | | | | | | | | | | | | | Closes #1366
* | | | Merge pull request #1929 from sobrinho/masterSantiago Pastorino2011-07-111-0/+14
|\ \ \ \ | | | | | | | | | | Create a test case for disable_referential_integrity
| * | | | Create a test case for disable_referential_integrityGabriel Sobrinho2011-07-011-0/+14
| | | | |
* | | | | Merge pull request #1608 from sishen/sishenJosé Valim2011-07-112-1/+25
|\ \ \ \ \ | |_|_|_|/ |/| | | | MemcacheStore: deserialize the entry reading from local_cache when using
| * | | | MemcacheStore: deserialize the entry reading from local_cache when using rawDingding Ye2011-06-102-1/+25
| | | | |
* | | | | Merge pull request #1296 from c42engineering/issue636José Valim2011-07-112-1/+50
|\ \ \ \ \ | | | | | | | | | | | | Resubmitting issue #636 as a pull request
| * | | | | Issue #636 - Parsing an xml file with multiple records and extra attributes ↵Sidu Ponnappa2011-07-112-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | (besides type) fails
* | | | | | Merge pull request #1924 from cesario/1922-get-back-and-deprecate-env-defaultJosé Valim2011-07-112-0/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Put back Rails.application#env_default and deprecate it [Closes #1922]
| * | | | | Rails.application#env_config is now public API. [Closes #1924]Franck Verrot2011-07-112-0/+18
|/ / / / /
* | | | | Merge pull request #1823 from gnarg/masterSantiago Pastorino2011-07-102-2/+10
|\ \ \ \ \ | | | | | | | | | | | | Log instrumentation name for exists? queries
| * | | | | Log instrumentation name for exists? queriesJon Guymon2011-06-222-2/+10
| | | | | |
* | | | | | Make Rails.groups accept arrays.José Valim2011-07-102-4/+7
| | | | | |
* | | | | | Merge pull request #2026 from spohlenz/asset-tag-fixJosé Valim2011-07-101-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Include TagHelper within AssetTagHelper
| * | | | | | Include TagHelper within AssetTagHelperSam Pohlenz2011-07-101-0/+2
|/ / / / / /
* | | | | | to_key on a destroyed model should return nilSantiago Pastorino2011-07-092-2/+2
| | | | | |
* | | | | | Merge pull request #2007 from amatsuda/having_vargs_nomethoderror_fixSantiago Pastorino2011-07-092-8/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | having() raises NoMethodError: undefined method `empty?' when the given argument does not respond to empty?
| * | | | | | formatsAkira Matsuda2011-07-091-5/+5
| | | | | | |
| * | | | | | fix AR having() not to raise NoMethodError when the given argument does not ↵Akira Matsuda2011-07-092-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 Leighton2011-07-092-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | a join. Related: #1873.
* | | | | | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-0914-63/+86
|\ \ \ \ \ \
| * | | | | | Add section about debugging assetsRyan Bigg2011-07-091-1/+25
| | | | | | |
| * | | | | | Clarify that per-controller asset files are not 'magically' loaded by the ↵Ryan Bigg2011-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | controller, but rather need to be required
| * | | | | | Merge pull request #51 from christopherscott/masterChristopher Scott Hernandez2011-07-081-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Single word change (find -> where) on active record query page
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 08:31:22 +0000