| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge pull request #5268 from carlosantoniodasilva/ar-new-record-warning | Jon Leighton | 2012-03-04 | 3 | -1/+10 | |
| |\ | | | | | Fix ActiveRecord warning in tests with Marshal | |||||
| | * | Initialize @stale_state to nil in association | Carlos Antonio da Silva | 2012-03-04 | 3 | -6/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This apparently fix the warning related to @new_record variable not being initialized in AR's test suit, when an association is built and the object is marshalled/loaded. See these tests in AR's base_test.rb: test_marshalling_with_associations test_marshalling_new_record_round_trip_with_associations Closes #3720. | |||||
| | * | Added test case for new_record round trip with associations problem | kennyj | 2012-03-04 | 1 | -0/+14 | |
| | | | ||||||
| * | | remove troll | Jon Leighton | 2012-03-04 | 1 | -3/+0 | |
| | | | ||||||
| * | | tidy up formatting | Jon Leighton | 2012-03-04 | 1 | -10/+11 | |
| | | | ||||||
| * | | Merge pull request #5267 from kennyj/fix_4674 | Jon Leighton | 2012-03-04 | 2 | -5/+38 | |
| |\ \ | | | | | | | Fix GH #4674. Reset column information and sequence name when setting table_name. | |||||
| | * | | Don't clear sequence name when we explicitly assign it. | kennyj | 2012-03-04 | 2 | -2/+15 | |
| | | | | ||||||
| | * | | Fix GH #4674. Reset column information and sequence name when setting ↵ | kennyj | 2012-03-04 | 2 | -4/+24 | |
| | | | | | | | | | | | | | table_name. | |||||
| * | | | wow how come I commit in master? O_o | homa | 2012-03-04 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | Merge pull request #5269 from ↵ | Piotr Sarnacki | 2012-03-04 | 1 | -1/+0 | |
| |\ \ \ | | | | | | | | | | | | | | | | | castlerock/remove_unwanted_require_karnel_reporting AS/kernel/reporting no where used in ts_isolated | |||||
| | * | | | AS/kernel/reporting no where used in ts_isolated | Vishnu Atrai | 2012-03-04 | 1 | -1/+0 | |
| | |/ / | ||||||
| * | | | Merge pull request #5266 from bcardarella/root_with_string_options | Piotr Sarnacki | 2012-03-04 | 2 | -0/+14 | |
| |\ \ \ | | | | | | | | | Route root helper shortcut | |||||
| | * | | | Route root helper shortcut | Brian Cardarella | 2012-03-03 | 2 | -0/+14 | |
| | | | | | | | | | | | | | | | | | Allow the root route helper to accept just a string | |||||
| * | | | | Merge pull request #5270 from kennyj/fix_3163 | Piotr Sarnacki | 2012-03-04 | 3 | -1/+22 | |
| |\ \ \ \ | |_|/ / |/| | | | Fix GH #3163. Should quote database on mysql/mysql2. | |||||
| | * | | | Fix GH #3163. Should quote database on mysql/mysql2. | kennyj | 2012-03-05 | 3 | -1/+22 | |
| |/ / / | ||||||
| * | | | Fix rake test_sqlite3_mem | Jon Leighton | 2012-03-04 | 1 | -7/+9 | |
| | | | | ||||||
| * | | | Remove unusused variables | Jon Leighton | 2012-03-04 | 3 | -14/+9 | |
| |/ / | ||||||
| * | | [engines guide] Add more concrete example of conflicts when not using ↵ | Piotr Sarnacki | 2012-03-03 | 1 | -1/+1 | |
| | | | | | | | | | isolate_namespace | |||||
| * | | Handle files from ActionDispatch::Static with Rack::Sendfile (fixes #5225) | Piotr Sarnacki | 2012-03-03 | 3 | -5/+18 | |
| |/ | | | | | | | | This makes rails behave properly when you serve static assets and you have X-Sendfile headers enabled. Nevertheless in most cases you should not rely on that and serve static assets with a webserver like Apache or Nginx (as you already have it in place anyway if you use X-Sendfile) | |||||
| * | Merge pull request #5255 from carlosantoniodasilva/active-record-review | Piotr Sarnacki | 2012-03-03 | 8 | -68/+77 | |
| |\ | | | | | Refactor and cleanup in some ActiveRecord modules | |||||
| | * | Refactor and cleanup in some ActiveRecord modules | Carlos Antonio da Silva | 2012-03-03 | 8 | -68/+77 | |
| | | | | | | | | | | | | | | | | | | | | | | | * Avoid double hash lookups in AR::Reflection when reflecting associations/aggregations * Minor cleanups: use elsif, do..end, if..else instead of unless..else * Simplify DynamicMatchers#respond_to? * Use "where" instead of scoped with conditions hash * Extract `scoped_by` method pattern regexp to constant * Extract noisy class_eval from method_missing in dynamic matchers * Extract readonly check, avoid calling column#to_s twice in persistence * Refactor predicate builder, remove some variables | |||||
| * | | Merge pull request #5246 from lest/patch-2 | José Valim | 2012-03-03 | 1 | -1/+1 | |
| |\ \ | | | | | | | simplify namespace assignment in fields_for | |||||
| | * | | simplify namespace assignment in fields_for | Sergey Nartimov | 2012-03-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #5260 from castlerock/remove_ordered_hash_usages | Santiago Pastorino | 2012-03-03 | 5 | -6/+6 | |
| |\ \ \ | | | | | | | | | remove usage of AS::OrderedHash from other places | |||||
| | * | | | remove usages of AS::OrderedHash | Vishnu Atrai | 2012-03-03 | 5 | -6/+6 | |
| |/ / / | ||||||
| * | | | Merge pull request #4984 from raghunadhd/change_orderhash | Vijay Dev | 2012-03-03 | 3 | -3/+3 | |
| |\ \ \ | | | | | | | | | Refactored code | |||||
| | * | | | Refactored code | Raghunadh | 2012-02-10 | 3 | -3/+3 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-03 | 6 | -19/+65 | |
| |\ \ \ \ | ||||||
| | * | | | | copy edits [ci skip] | Vijay Dev | 2012-03-03 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Made documentation of config.assets.precompile slightly more explicit. | Guy Bolton King | 2012-03-02 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having read the previous version of the documentation, I was surprised when a wildcarded CSS pattern in precompile picked up a whole load of SCSS files! I've amended lines 426 onwards to document the behaviour. | |||||
| | * | | | | Removed max-stale from the setting the cache-headers in the response as ↵ | Anuj Dutta | 2012-03-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | max-stale is a cache request header. | |||||
| | * | | | | Add documentation for IndexDefinition. | Waseem Ahmad | 2012-03-02 | 1 | -0/+3 | |
| | | | | | | ||||||
| | * | | | | Improve header hierarchy. | Joost Baaij | 2012-02-29 | 1 | -1/+3 | |
| | | | | | | ||||||
| | * | | | | Include a comment as to why ETag header should be removed from the response. | Joost Baaij | 2012-02-29 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | Changed asset_host config to more specific | Rahul P. Chaudhari | 2012-02-29 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Some cleanup on the upgrading guide | Mike Gunderloy | 2012-02-28 | 1 | -14/+40 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #85 from whilefalse/rails_32_engine_upgrade | Vijay Dev | 2012-02-28 | 1 | -0/+12 | |
| | |\ \ \ \ | | | | | | | | | | | | | Added guide to updating engines built in previous versions of Rails | |||||
| | | * | | | | Added guide to updating engines built in previous versions of Rails | Steven Anderson | 2012-02-24 | 1 | -0/+12 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #5258 from guilleiguaran/amo-model | Jon Leighton | 2012-03-03 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Use public_send instead of send in ActiveModel::Model initialize | |||||
| | * | | | | | | Use public_send instead of send in ActiveModel::Model initialize | Guillermo Iguaran | 2012-03-03 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #5256 from carlosantoniodasilva/active-model-model | José Valim | 2012-03-03 | 3 | -1/+81 | |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Add docs with usage examples for ActiveModel::Model | |||||
| | * | | | | | Add docs with usage examples for ActiveModel::Model | Carlos Antonio da Silva | 2012-03-03 | 3 | -1/+81 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | Also add test to ensure basic model does not explode when initialized with nil. | |||||
| * | | | | | Merge pull request #5253 from guilleiguaran/amo-model | Jeremy Kemper | 2012-03-02 | 4 | -0/+44 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Add ActiveModel::Model, a mixin to make plain Ruby objects work with AP out of box | |||||
| | * | | | | | Add ActiveModel::Model, a mixin to make Ruby objects to work with AP inmediatly | Guillermo Iguaran | 2012-03-02 | 4 | -0/+44 | |
| |/ / / / / | ||||||
| * | | | / | Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check ↵ | Santiago Pastorino | 2012-03-03 | 1 | -1/+1 | |
| | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | that info Closes #5245 | |||||
| * | | | | only log an error if there is a logger. fixes #5226 | Aaron Patterson | 2012-03-02 | 3 | -2/+11 | |
| | | | | | ||||||
| * | | | | Can't cache url_options on a controller level | Piotr Sarnacki | 2012-03-02 | 1 | -11/+12 | |
| | | | | | | | | | | | | | | | | | | | | | It fails if routes from to railties are called in one context, for example: blog.posts_path and main_app.users_path | |||||
| * | | | | Merge pull request #5243 from lest/patch-2 | José Valim | 2012-03-02 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | don't pass unnecessary argument | |||||
| | * | | | | don't pass unnecessary argument | Sergey Nartimov | 2012-03-02 | 1 | -2/+2 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #5242 from rails/opt_routes | José Valim | 2012-03-02 | 9 | -48/+107 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize routes generation in simple cases. If you pass to the route helper the same amount of arguments as the required segments, route generation will be optimized as a string interpolation. After this commit, `post_path(post)` is about 6.5 times faster, `post_url(post)` is about 5 times. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |