Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | We already have the record; no need to retrieve it again | John Firebaugh | 2011-07-17 | 1 | -2/+2 |
| | |||||
* | Replace map+compact with select | John Firebaugh | 2011-07-17 | 1 | -1/+1 |
| | |||||
* | Add a test | John Firebaugh | 2011-07-17 | 1 | -0/+5 |
| | |||||
* | serializable_hash(:only => [], :methods => [:foo]) should work | John Firebaugh | 2011-07-17 | 2 | -7/+14 |
| | |||||
* | Merge pull request #2118 from arunagw/fix_plugin_gen_test | Santiago Pastorino | 2011-07-17 | 1 | -1/+1 |
|\ | | | | | As we are adding db folder in it. Required in test also. | ||||
| * | As we are adding db folder in it. Required in test also. | Arun Agrawal | 2011-07-17 | 1 | -1/+1 |
|/ | |||||
* | indeed, if we are going to remove everything in public/assets on ↵ | Xavier Noria | 2011-07-17 | 1 | -4/+1 |
| | | | | assets:clean, just do that | ||||
* | if we are cleaning all files, we are cleaning all gz files | Xavier Noria | 2011-07-17 | 1 | -1/+0 |
| | |||||
* | Merge pull request #2082 from htanata/rake_routes_formatting | Santiago Pastorino | 2011-07-16 | 4 | -15/+107 |
|\ | | | | | Better formatting of rake routes (issue #1991) | ||||
| * | Improve formatting of route to Rack application in rake routes. | Hendy Tanata | 2011-07-17 | 2 | -3/+24 |
| | | | | | | | | | | | | | | | | | | | | This route: match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/ is shown as: /foo/:id(.:format) RackApp {:id=>/[A-Z]\d{5}/} | ||||
| * | Better formatting of route requirements in rake:routes. | Hendy Tanata | 2011-07-16 | 4 | -14/+85 |
| | | | | | | | | | | | | | | | | | | | | Previously it was: {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/} Now it becomes: photos#show {:id=>/[A-Z]\d{5}/} | ||||
* | | Merge pull request #2108 from loz/master | Santiago Pastorino | 2011-07-16 | 1 | -0/+5 |
|\ \ | | | | | | | Adds gem helper rake tasks to engines generator | ||||
| * | | Added gem helper to rake task for engines, as per pull request from ↵ | Jonathan Lozinski | 2011-07-16 | 1 | -0/+5 |
| | | | | | | | | | | | | 3-1-stable, #2103 | ||||
* | | | Fix the output a bit | Santiago Pastorino | 2011-07-16 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2101 from loz/master | José Valim | 2011-07-16 | 1 | -1/+1 |
|\| | | | | | | | | Added db to gemspec so migrations are packaged | ||||
| * | | Added db to gemspec files so migrations are correctly packaged | Jonathan Lozinski | 2011-07-16 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2090 from htanata/fix_wildcard_route_code_in_changelog | Santiago Pastorino | 2011-07-15 | 1 | -2/+2 |
|\ \ | |/ |/| | Fix wildcard route code example in changelog | ||||
| * | Fix wildcard route code example in changelog. | Hendy Tanata | 2011-07-16 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #2073 from bfolkens/master | Santiago Pastorino | 2011-07-14 | 1 | -0/+5 |
|\ | | | | | ported test from pull request #2071 to master | ||||
| * | assert nothing raised for setting a cookie value to nil in ActionDispatch | Bradford Folkens | 2011-07-14 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #2063 from elight/master | Santiago Pastorino | 2011-07-14 | 2 | -3/+29 |
|\ \ | | | | | | | Patch for https://github.com/rails/rails/issues/2059 | ||||
| * | | Fix and unit test for https://github.com/rails/rails/issues/2059 | Evan Light | 2011-07-14 | 2 | -3/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache key was incorrectly using timezone-dependent record#updated_at when it should be using a timezone-independent value to generate the cache key Minor refactoring to cache_key timezone test Closes #2059 Adds a test to validate the format of the cache_key for nil and present updated_at values Correctly handles updated_at == nil | ||||
* | | | Merge pull request #1807 from caius/find_in_batches_id_bug | Santiago Pastorino | 2011-07-14 | 2 | -2/+21 |
|\ \ \ | |_|/ |/| | | Bugfix by stopping find_in_batches using the records after yielding. | ||||
| * | | Stop find_in_batches using the records after yielding. | Caius Durling | 2011-06-21 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | | | | Currently if the code that calls .find_in_batches modifies the yielded array in place then .find_in_batches can enter an infinite loop searching with ruby object ids in the database instead of the primary key of records in the database. This happens because it naively assumes the yielded array hasn't been modified before calling #id on the last object in the array. And ruby (1.8 at least) alias' #id to #object_id so an integer is still returned no matter what the last object is. By moving finding the #id of the last object before yielding the array it means the calling code can do whatever it wants to the array in terms of modifying it in place, and .find_in_batches doesn't care. | ||||
* | | | Merge pull request #2066 from amatsuda/magicome | Aaron Patterson | 2011-07-14 | 2 | -0/+4 |
|\ \ \ | |_|/ |/| | | missing magic comments | ||||
| * | | need magic comments | Akira Matsuda | 2011-07-14 | 2 | -0/+4 |
|/ / | |||||
* | | Merge pull request #2052 from amatsuda/fullwidth_blank | Aaron Patterson | 2011-07-13 | 2 | -2/+6 |
|\ \ | | | | | | | treat fullwidth whitespace as a blank character | ||||
| * | | treat fullwidth whitespace as a blank character | Akira Matsuda | 2011-07-14 | 2 | -2/+6 |
| | | | |||||
* | | | Bump rack up | Santiago Pastorino | 2011-07-13 | 1 | -1/+1 |
|/ / | |||||
* | | 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. |