aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails into ↵Andrew White2013-09-302-1/+11
|\ | | | | | | tamird-fix-ip-spoof-errors
| * make sure both headers are set before checking for ip spoofingTamir Duberstein2013-06-042-1/+11
| |
* | fix `test_sqlite3_mem` test run.Yves Senn2013-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | marshalling between processes does not work with an in-memory db. This breaks the `test_sqlite3_mem` run (see stacktrace below). After that failure most tests start to fail randomly. ``` /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb:512:in `table_structure': Could not find table 'posts' (ActiveRecord::StatementInvalid) from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb:399:in `columns' from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/schema_cache.rb:93:in `block in prepare_default_proc' from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/schema_cache.rb:44:in `yield' from /Users/senny/Projects/rails/activerecord/lib/active_record/connection_adapters/schema_cache.rb:44:in `columns' from /Users/senny/Projects/rails/activerecord/lib/active_record/model_schema.rb:208:in `columns' from /Users/senny/Projects/rails/activerecord/lib/active_record/model_schema.rb:249:in `column_defaults' from /Users/senny/Projects/rails/activerecord/lib/active_record/locking/optimistic.rb:171:in `column_defaults' from /Users/senny/Projects/rails/activerecord/lib/active_record/core.rb:167:in `initialize' from /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:27:in `new' from /Users/senny/Projects/rails/activerecord/lib/active_record/inheritance.rb:27:in `new' from /Users/senny/Projects/rails/activerecord/test/cases/base_test.rb:1368:in `block in test_marshal_between_processes' from /Users/senny/Projects/rails/activerecord/test/cases/base_test.rb:1366:in `fork' from /Users/senny/Projects/rails/activerecord/test/cases/base_test.rb:1366:in `test_marshal_between_processes' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:110:in `block (3 levels) in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:208:in `capture_exceptions' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:107:in `block (2 levels) in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:260:in `time_it' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:106:in `block in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:296:in `on_signal' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:280:in `with_info_handler' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest/test.rb:105:in `run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:268:in `block (2 levels) in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:267:in `each' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:267:in `block in run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:296:in `on_signal' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:285:in `with_info_handler' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:266:in `run' from /Users/senny/Projects/rails/activesupport/lib/active_support/test_case.rb:31:in `block in __run' from /Users/senny/Projects/rails/activesupport/lib/active_support/test_case.rb:31:in `map' from /Users/senny/Projects/rails/activesupport/lib/active_support/test_case.rb:31:in `__run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:115:in `run' from /Users/senny/Projects/rails/.bundle/gems/minitest-5.0.8/lib/minitest.rb:46:in `block in autorun' ``` /cc @tenderlove
* | Merge pull request #12383 from marclennox/masterRafael Mendonça França2013-09-292-2/+11
|\ \ | | | | | | Fixed issue #12327
| * | Fixed issue #12327Marc Lennox2013-09-272-2/+11
| | |
* | | Merge pull request #12400 from ↵Rafael Mendonça França2013-09-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | jaredbeck/fixes_guide_re_action_on_unpermitted_parameters Fixes incorrect spelling of `action_on_unpermitted_parameters` in guide
| * | | fixes incorrect spelling of `action_on_unpermitted_parameters`Jared Beck2013-09-281-1/+1
|/ / / | | | | | | | | | See `actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb`
* | | Merge pull request #12354 from kennyj/fix_12293Rafael Mendonça França2013-09-283-1/+26
|\ \ \ | | | | | | | | Closes #12293. Strong parameters should permit nested number as key.
| * | | Strong parameters should permit nested number as key. Closes #12293kennyj2013-09-273-1/+26
| | | |
* | | | Merge pull request #12387 from francisgo/patch-9Rafael Mendonça França2013-09-281-14/+14
|\ \ \ \ | | | | | | | | | | Migrations Guide: Add semicolon to sentences before code block [ci skip]
| * | | | Migrations Guide: Add semicolon to sentences before code block [ci skip]Francis Go2013-09-281-14/+14
| | | | |
* | | | | Merge pull request #12398 from thedarkone/thread-safety-stuffRafael Mendonça França2013-09-283-25/+35
|\ \ \ \ \ | | | | | | | | | | | | Thread safety fixes
| * | | | | Make GTG::TransTable thread safe.thedarkone2013-09-281-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | From now on only the `[]=` method is allowed to modify the internal states hashes.
| * | | | | Use TS::Cache instead of Mutex + Hash.thedarkone2013-09-281-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | TS::Cache#compute_if_absent guarantees that only a single thread will get to execute the provided block for a given key.
| * | | | | Replace global Hash with TS::Cache.thedarkone2013-09-281-1/+4
| | | | | |
* | | | | | Merge pull request #11496 from ↵Rafael Mendonça França2013-09-284-4/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/11376_has_many_assoc_respect_scope_on_build Removed where_values_hash from AR::NullRelation
| * | | | | | Removed where_values_hash from AR::NullRelationPaul Nikitochkin2013-09-284-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to build associated records for owners which has not been saved need to get where values to use as default attributes. But for new record owner uses `ActiveRecord::NullRelation` which override `where_values_hash` to return empty hash stub. `where_values_hash` is not used to invoke any sql query, but good to build others chains (even will be never executed) like: ```ruby post = Post.new admin_comment = post.admin_comments.build assert_equal 'Admin', admin_comment.author ``` Closes #11376, #11676, #11675
* | | | | | | Merge pull request #12396 from arthurnn/cleanup_logsubsRafael Mendonça França2013-09-281-11/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Cleanup identitymap logger from LogSubscriber
| * | | | | | | Cleanup identitymap logger from LogSubscriberArthur Neves2013-09-281-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also renaming ivar @odd_or_even to @odd
* | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-2810-60/+27
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Added missing active record configurations.wangjohn2013-09-251-0/+6
| | | | | | | |
| * | | | | | | Fix link_to return valueEarl J St Sauver2013-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation is showing the link_to method as just returning the contents of the url_for method. It should be returning an "<a>" tag with the correct href set.
| * | | | | | | use active voice and use more descriptive termsWeston Platter2013-09-221-1/+1
| | | | | | | |
| * | | | | | | `skiping` => `skipping`Vipul A M2013-09-171-1/+1
| | | | | | | |
| * | | | | | | Fix Show link on resourceVipul A M2013-09-171-1/+1
| | | | | | | |
| * | | | | | | incorrect urlSergio2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | incorrect url
| * | | | | | | incorrect urls Sergio2013-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | I've found two incorrects urls for adding ':' at the end of the url
| * | | | | | | surplus : in attachment_fu pluginSergio2013-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | surplus ':' character in url
| * | | | | | | EncryptedCookieStore => CookieStore [ci skip]Rashmi Yadav2013-09-131-1/+1
| | | | | | | |
| * | | | | | | asset_url => asset-url in sass-rails docs [ci skip]Rashmi Yadav2013-09-131-1/+1
| | | | | | | |
| * | | | | | | Removed doc of diff method [ci skip]Rashmi Yadav2013-09-131-38/+0
| | | | | | | |
| * | | | | | | Updated guides with latest method [ci skip]Rashmi Yadav2013-09-131-2/+2
| | | | | | | |
| * | | | | | | Updated the file path [ci skip]Rashmi Yadav2013-09-131-4/+4
| | | | | | | |
| * | | | | | | Updated with latest method [ci skip]Rashmi Yadav2013-09-131-4/+5
| | | | | | | |
| * | | | | | | Revert ""generates" applies to "collection radio" so it should be singular"Rafael Mendonça França2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit faeb33dc036e4f707491c91a23ee3e990573141b. Reason: Code changes can't be done on docrails
| * | | | | | | take out reference to previous versions of RailsWaynn Lue2013-09-121-3/+1
| | | | | | | |
| * | | | | | | "generates" applies to "collection radio" so it should be singularWaynn Lue2013-09-121-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #12391 from francisgo/patch-10Yves Senn2013-09-281-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Migrations Guide: Fix line length [ci skip]
| * | | | | | | Migrations Guide: Fix line length [ci skip]Francis Go2013-09-281-2/+2
|/ / / / / / /
* | | | | | | adding a test to demonstrate how to use STI subclasses on the far rightAaron Patterson2013-09-273-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | side of a hm:t association along with preloading.
* | | | | | | Merge pull request #12388 from rkofman/masterJeremy Kemper2013-09-271-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Fixed grammatical typo in configuring.md guide.
| * | | | | | Fixed grammatical typo in configuring.md guide.Roman Kofman2013-09-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #12385 from francisgo/patch-8Guillermo Iguaran2013-09-271-0/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | Getting Started Guide: Fix code container in Chapter 5.2 [ci-skip]
| * | | | | Getting Started Guide: Fix code container in Chapter 5.2 [ci-skip]Francis Go2013-09-281-0/+2
|/ / / / /
* | | | | Merge pull request #12366 from francisgo/patch-4Yves Senn2013-09-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Getting Started Guide: Update sentence in Chapter 5.8 [ci-skip]
| * | | | | Getting Started Guide: Update sentence in Chapter 5.8 [ci-skip]Francis Go2013-09-271-1/+1
| | | | | |
* | | | | | Merge pull request #12233 from claudiob/delete-actionpack-unused-fixtureYves Senn2013-09-271-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove HelperyTestHelper not used in any test
| * | | | | | Remove HelperyTestHelper not used in any testclaudiob2013-09-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HelperyTestHelper was introduced in 66ef922 by @josevalim to pair with HelperyTestController. This test controller was later removed in e10a253 by @strzalek, leaving HelperyTestHelper unused
* | | | | | | Merge pull request #12379 from francisgo/patch-7Yves Senn2013-09-271-0/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Add new line after create action on CommentsController code example [ci skip]
| * | | | | | Add new line after create action on CommentsController code exampleFrancis Go2013-09-271-0/+1
|/ / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 02:26:59 +0000