More at rubyonrails.org: Overview | Download | Deploy | Code | Screencasts | Documentation | Community | Blog

Rails 4.0.4
Showing 299 commits

Hash Date Message
2abe4b0 2014-03-14 Preparing for 4.0.4 release
0d46739 2014-03-14 Match the whole string
03d89f9 2014-03-14 Add release date
1037dad 2014-03-14 Force sass-rails ~> 4.0.2 to avoid sprockets compatibili...
26bfdf9 2014-03-11 Preparing for 4.0.4.rc1 release
71662c8 2014-03-11 Use released arel version
f48f51d 2014-03-11 Fixes STI when 2+ levels deep.
51d9bed 2014-03-10 Review CHANGELOGs [ci skip]
f756e0c 2014-03-10 Merge pull request #8313 from alan/only_save_changed_has...
05bfc18 2014-03-08 Copy shallow options from normal options when using scope
09c6c85 2014-03-08 Pull namespace defaults out of the options hash
6adc92e 2014-03-08 Only use shallow nested scope when depth is > 1
26b3423 2014-03-08 Move setting :scope_level_resource to resource_scope
ac65da2 2014-03-08 Merge pull request #14198 from arthurnn/fix_14188
d80efad 2014-03-08 Tests for indifferent access using full_messages_for. Cl...
5ad4c8d 2014-03-07 Syntax polishing
b57da83 2014-03-07 Fix OrderedHash.select to return self instance.
d682b0d 2014-02-27 Replace "data store" with database [ci skip]
6b927b8 2014-02-26 Remove warnings on Ruby 2.1
fc2641d 2014-02-26 HashWithIndifferentAccess#select working as intended
5b74b23 2014-02-26 Merge pull request #14199 from arthurnn/travis_211
772afef 2014-02-26 Merge pull request #14210 from tjschuck/bcrypt_gem_renam...
085372e 2014-02-26 Bump version of bcrypt gem
d91d946 2014-02-25 Fixed STI classes not defining an attribute method if th...
5a782db 2014-02-25 Merge pull request #14177 from yahonda/skip_tests_if_dup...
5772ffe 2014-02-25 Merge pull request #14182 from mecampbellsoup/fix_typo_i...
9f76b1f 2014-02-25 `ActionDispatch::Head` was replaced by `Rack::Head`. Clo...
25dd7c9 2014-02-24 Merge pull request #14170 from kritik/master
64bbc9e 2014-02-24 Methods silence_stream/quietly are not thread-safe [skip...
e8458d0 2014-02-23 Merge pull request #12774 from exAspArk/fix_uniqueness_o...
f214896 2014-02-21 Merge pull request #14140 from WojtekKruszewski/optimize...
20f475c 2014-02-21 Revert "Only lookup `config.log_level` for stdlib `::Log...
ba68e75 2014-02-20 releasing Rails no longer needs triggering docs generati...
2ec916b 2014-02-20 Check `respond_to` before delegation due to: https://git...
2213cb8 2014-02-19 Pointing to latest guides [ci skip]
97c105a 2014-02-19 [ci skip] Close the meta tag with '/>' instead of '>'
3e215c0 2014-02-18 Use the reference for the mime type to get the format
2413ba5 2014-02-18 Merge branch '4-0-3' into 4-0-stable
ad84512 2014-02-16 Merge pull request #14078 from gsamokovarov/hstore_array...
d96d7e8 2014-02-16 Resolve encoding issues with arrays of hstore (bug 11135).
0ea8e5f 2014-02-15 Merge pull request #14072 from robin850/patch-16
702f3dc 2014-02-14 Merge pull request #14059 from tbpgr/guides_active_suppo...
deb32f6 2014-02-13 Merge pull request #14034 from hdabrows/drop-correct-ind...
2dad2bc 2014-02-13 Merge pull request #14036 from matthewd/pg_terminate_bac...
e1c2b8a 2014-02-13 Terminate the backend ourselves on PG 9.2+
6ebc07b 2014-02-12 Don't create fibers just to iterate
ccb0301 2014-02-11 Use a custom route vistor for optimized route generation
ce671be 2014-02-09 Set the :shallow_path as each scope is generated
9337f64 2014-02-09 Merge pull request #13981 from Fortisque/kevin/postgresq...
a373ec7 2014-02-08 Updated the cookie docs to use the safer JSON.{generate,...
eebb813 2014-02-08 docs, Cookie values are String based. Closes #12860. [ci...
9369486 2014-02-05 docs, AR already auto-detects primary keys. Closes #13946.
bff8c2c 2014-02-04 Merge pull request #13935 from arthurnn/fix_12566
98e2ae9 2014-02-04 `#to_param` returns `nil` if `to_key` returns `nil`. Clo...
d5e684f 2014-02-03 Merge pull request #11770 from timruffles/doc_ajax_xhr
3469cee 2014-02-03 Merge pull request #13926 from fredwu/doc_polymorphic_st...
e6003cb 2014-02-01 Fix tests
7971cb2 2014-02-01 Merge pull request #13688 from jbaudanza/psql-index-exists
4dcda46 2014-02-01 Merge pull request #13863 from joshjordan/jsj-dont-throw...
a4d4afd 2014-02-01 Merge pull request #13912 from mauricio/bug-13907
0603d53 2014-02-01 Merge pull request #12769 from birkirb/master
286542a 2014-01-30 Merge pull request #13886 from arthurnn/fix_relation_arel
9541434 2014-01-30 Merge pull request #13612 from eval/issue-13588
56ac83b 2014-01-30 Merge pull request #13868 from mauricio/bug-13788
4e29dad 2014-01-29 Merge pull request #13867 from mauricio/bug-13861
6704f90 2014-01-28 Merge pull request #13857 from teoljungberg/replace-file...
b5a6b6a 2014-01-27 Clear filtered request attributes between requests in tests
b942b2e 2014-01-24 Merge pull request #13829 from qsymmachus/improve_valida...
4b85b3f 2014-01-24 Merge pull request #13811 from mdesantis/issue-13810
e3130a3 2014-01-21 `has_one` and `belongs_to` accessors don't add ORDER BY ...
e74e96a 2014-01-21 Merge pull request #13696 from senny/engine_bin_rails_lo...
df5a873 2014-01-21 Merge pull request #9969 from divineforest/fix-find-in-b...
c4083cb 2014-01-18 Merge pull request #13748 from summerblue/master
5621c0c 2014-01-18 Merge pull request #13751 from chancancode/ar_rollback_fix
59b6686 2014-01-17 Fix eager load of Serializers on Active Model
d725728 2014-01-17 Only some dynamic finders are deprecated.
17944b3 2014-01-16 Merge pull request #13723 from BlakeMesdag/add-back-syck...
1240338 2014-01-16 Add back yaml_initialize hook to AR::Core for Syck deser...
0a66a47 2014-01-16 Merge branch 'ca-touch-commit-callbacks'
fd2d144 2014-01-14 Don't try to get the subclass if the inheritance column ...
fc93b5b 2014-01-14 Merge pull request #13706 from prathamesh-sonpatki/issue...
e2b2539 2014-01-13 Only lookup `config.log_level` for stdlib `::Logger`. Cl...
68cd3bc 2014-01-13 fix bug in becomes! when changing from base to subclass....
6860082 2014-01-13 doc proc/lambda arg on inclusion validation. Closes #136...
9c946be 2014-01-12 Add CHANGELOG entry for #13668
ecd0707 2014-01-12 Fix iterating over DateTime by doing strict checking for...
7d3a336 2014-01-10 document implicit readonly. Closes #13660. [ci skip]
e842a22 2014-01-10 Merge pull request #13657 from leriksen/master
aa887c1 2014-01-07 Merge pull request #13597 from prathamesh-sonpatki/hstor...
3307346 2014-01-07 Merge pull request #13355 from dylanahsmith/migration-ve...
2051231 2014-01-07 doc backport for getting started - "Showing Posts" secti...
bfbf8ab 2014-01-06 Merge pull request #13617 from arthurnn/error_var
7678ab6 2014-01-06 Merge pull request #13593 from oliveiraethales/store_yam...
5d3a8f1 2014-01-05 Unique the segment keys array for non-optimized url helpers
2df304c 2014-01-05 Show full route constraints in error message
c5b446c 2014-01-04 Merge pull request #13590 from kuldeepaggarwal/fix-date-...
5390187 2014-01-04 Fixed documentation. [ci skip]
4e5f0e7 2014-01-03 Merge pull request #13579 from prathamesh-sonpatki/issue...
b2e3a90 2014-01-02 Disable THOR_DEBUG while running generators
0c73408 2014-01-02 Enable fast_finish in the travis configuration
20b12c9 2014-01-01 Merge pull request #13557 from gmarik/patch-1
6612de4 2014-01-01 Merge pull request #13562 from robin850/travis
eea0fe6 2014-01-01 Update the Travis configuration file
5827374 2014-01-01 Merge pull request #12759 from dmarkow/backport-9675c7d
c263a9a 2014-01-01 Merge pull request #13561 from robin850/issue-11723
2ff4933 2014-01-01 Allow engine root relative redirects using an empty string.
2612248 2013-12-29 Test with 2.1.0
1e37945 2013-12-29 Fix Encoding::CompatibilityError when public path is UTF-8
a0024e3 2013-12-27 doc fix. Use `sess.path` within `open_session`. Closes #...
2b4d71b 2013-12-26 Merge pull request #11368 from Amit-Thawait/master
b23d3ff 2013-12-24 Merge pull request #13455 from jetthoughts/13445_fix_tou...
8530f4b 2013-12-23 AC::Parameters#permit! permits hashes in array values
887757a 2013-12-23 Update configuring guide with I18n options regarding ava...
d5a8b04 2013-12-23 Merge pull request #13341 from carlosantoniodasilva/ca-i18n
956d05e 2013-12-23 Fix a couple issues on PostgreSQL with array columns
56962ba 2013-12-23 Move the null mime type to request.format
9571dc4 2013-12-22 build fix for #13451. Declare missing attribute.
fb78c1e 2013-12-22 CHANGELOG entry for #13451. [ci skip]
44051e2 2013-12-22 Merge pull request #13451 from dmathieu/quoting_non_strings
ad9570e 2013-12-21 Test with 2.1.0-rc1
32a8940 2013-12-21 optimizes array conversion in AC::Parameters
ba02e8b 2013-12-21 refactors AC::Parameters#fetch
72c353f 2013-12-21 converts hashes in arrays of unfiltered params to unperm...
294d418 2013-12-19 Merge pull request #13412 from arthurnn/quote_id_not_id
9a3c8f8 2013-12-19 Fix assertions for testing unknown formats using Mime::N...
a5434dd 2013-12-19 Fix changelog indent [ci skip]
0585ba0 2013-12-19 Show routes defined under assets prefix
2fb582f 2013-12-18 #none documentation updated [ci skip]
da5cb3b 2013-12-16 Remove the link for code.whytheluckystiff.net
dd1a5ee 2013-12-16 Merge pull request #10942 from yangchenyun/mine
dcf17c4 2013-12-16 Merge pull request #13328 from teohm/dbconsole_support_d...
c4fd133 2013-12-16 Merge pull request #13333 from kia84/master
db86ce0 2013-12-15 Merge pull request #13312 from arthurnn/fix_db_task_req
0f3c6dc 2013-12-14 Merge pull request #13324 from fphilipe/fix-syntax-error...
995ab46 2013-12-13 Merge pull request #13305 from psahni/form_tag_with_para...
6df07a3 2013-12-12 Merge pull request #13291 from strzibny/new_unique_const...
299bf86 2013-12-12 Merge pull request #13032 from kuldeepaggarwal/after_tou...
bec7255 2013-12-12 Merge pull request #13287 from aayushkhandelwal11/typo_r...
8a40ae5 2013-12-11 Merge pull request #13264 from laurocaetano/fix_dynamic_...
8431a99 2013-12-10 Merge pull request #13221 from stereoscott/patch-1
0c7691f 2013-12-10 Merge pull request #13258 from semaperepelitsa/docs
7f1407a 2013-12-10 Merge pull request #13259 from harshadsabne/4-0-stable
3e95dab 2013-12-10 [ci skip] Fix http_accept_language link syntax in 4-0-st...
7c4412a 2013-12-10 make `collect_deprecations` available.
d863753 2013-12-10 doc: date/conversions.rb should talk about date format n...
f5a0524 2013-12-10 Merge pull request #13236 from jetthoughts/13230_type_ca...
ea722e1 2013-12-10 Support deprecated finder options on associaiton calcula...
18eb3f7 2013-12-06 2.1.0 is green
c5a70cb 2013-12-06 Fix `singleton_class?`
62efd65 2013-12-06 SAFE = 4 is deprecated in Ruby 2.1
80a9b90 2013-12-06 Remove tests backported that should not
56a22cc 2013-12-05 Merge pull request #12684 from mariovisic/fix_kernel_sil...
16215d5 2013-12-05 Merge pull request #13207 from georgeguimaraes/backports...
2b3a41f 2013-12-05 Add integration test for #12459
9e82331 2013-12-05 ActiveRecord::ConnectionAdapters::Column.string_to_time ...
b632a82 2013-12-05 Merge pull request #13122 from andrielfn/fix-collection-...
d18ca97 2013-12-05 Improve AR changelog [ci skip]
73fa24e 2013-12-05 Revert "Merge pull request #13149 from laurocaetano/fix_...
5786baf 2013-12-05 Remove deprecated call to Relation#all
0fc20a6 2013-12-05 Fix missed stubs of File.exists? when changing to File.e...
fe6945e 2013-12-05 Using 2.3.11 URL for 2.3.x guides [ci skip]
0463698 2013-12-05 Merge pull request #12646 from severin/polymorphic_belon...
3f70d32 2013-12-05 Fix indent in AP changelog [ci skip]
0239396 2013-12-05 Cleanup Ruby 2.1 warnings on File.exists?
584e753 2013-12-05 Merge pull request #13183 from sorah/never_ignore_i18n_t...
b9ba80c 2013-12-04 Run Travis tests using Ruby 2.1.0-preview2 too
ad02f41 2013-12-04 Merge pull request #13176 from arunagw/4-0-stable
5518100 2013-12-04 Update guides welcome page to point to version 3.2.16 [c...
ae3e613 2013-12-04 Convert Mime::NullType in a singleton
4fdc156 2013-12-04 Merge pull request #13168 from acapilleri/format_localiz...
2c97d32 2013-12-04 Fix header Content-Type: #<Mime::NullType:...> in locali...
7b4e8f2 2013-12-04 Use the work "regression" to emphasize the fix [ci skip]
14cf8cb 2013-12-04 Merge pull request #13152 from mariovisic/text_helper_mi...
c7e2435 2013-12-04 Merge pull request #12403 from thedarkone/attr-method-mi...
1de4a04 2013-12-04 Fix documentation of number_to_currency helper
e18b2ca 2013-12-03 Merge pull request #13149 from laurocaetano/fix_offset_last
7920a93 2013-12-03 Remove the escaping skip
660ef3d 2013-12-03 Merge branch '4-0-sec' into 4-0-stable
9b0ad8d 2013-12-03 `connection.type_to_sql` returns a `String` for unmapped...
6e0ae5b 2013-12-03 Merge pull request #13145 from acapilleri/fix_email_example
908987d 2013-12-03 Merge pull request #13143 from joker1007/fix_active_reco...
e67690f 2013-12-03 Merge pull request #12123 from aredondo/master
50d1fe8 2013-12-02 Remove dead comment from AS extensions guide [ci skip]
80d5d12 2013-12-02 Merge pull request #13134 from rubiii/patch-1
0e2e51c 2013-12-02 `mail()` without arguments is a getter for the current m...
5f24b78 2013-12-02 Merge pull request #11466 from jetthoughts/updated_tesin...
8a930f8 2013-12-02 Update active_record_querying.md
8f7f1ce 2013-12-02 Cleanups in API docs: his => their
24b032d 2013-12-02 Add examples for gender neutral pronouns
8742eeb 2013-12-02 Update API docs guidelines with reference about gender n...
831d54a 2013-12-02 [ci skip] Removing some gender sensitive object pronouns
d0a7644 2013-12-02 Use genderless pronouns in security guide. [ci skip]
f84dbd5 2013-12-02 Use genderless pronouns in API docs
5fb67eb 2013-12-01 Improve changelogs [ci skip]
077bda2 2013-12-01 Merge pull request #13119 from sbagdat/patch-1
965fdc0 2013-12-01 Changelog entries for changes in config/application.rb t...
805768a 2013-12-01 config.assets.enabled isn't used anymore to disable Rail...
57fd6ba 2013-12-01 Honor to RAILS_GROUPS env variable while loading gems wi...
df53c34 2013-12-01 Removed redundant field name in the guide
405b5f6 2013-11-30 Merge pull request #13055 from dmitriy-kiriyenko/fix-seg...
997f078 2013-11-30 Merge pull request #13107 from chancancode/has_one_count...
ad29f6c 2013-11-29 Merge pull request #13104 from christophemaximin/fix_rob...
0ca5121 2013-11-27 Merge pull request #13067 from sagarjunnarkar/getting_st...
784927f 2013-11-27 Merge pull request #13071 from kuldeepaggarwal/documenta...
df0ece4 2013-11-27 Merge pull request #13070 from kuldeepaggarwal/documenta...
bd4abae 2013-11-27 Merge pull request #13018 from heruku/scoping_fix
34e6094 2013-11-26 Merge pull request #13061 from laurocaetano/fix-uniquene...
03d8463 2013-11-26 Fix bug when validating the uniqueness of an aliased att...
276e4e4 2013-11-26 Merge pull request #13057 from bricejlin/patch-1
c4e1f53 2013-11-26 Remove single trailing ')' bracket
7135c4a 2013-11-26 sync example and documentation for strong_parameters has...
21b8806 2013-11-23 Merge pull request #13012 from harrigan/master
adb3fc6 2013-11-22 Merge pull request #12996 from shreve/patch-2
ae1e5a7 2013-11-21 Merge pull request #12975 from sbagdat/fix-for-rake-routes
c40e286 2013-11-21 Use `SchemaStatements#initialize_schema_migrations_table...
5da96e0 2013-11-21 Merge pull request #12970 from prathamesh-sonpatki/issue...
14ef77b 2013-11-18 rails new --edge should generate a edge version in the 4...
eaf0d50 2013-11-16 Merge pull request #12918 from versioncontrol/rails-12866
080a680 2013-11-16 Merge pull request #12916 from petervandenabeele/typo_4_...
cf06bc5 2013-11-16 Merge pull request #12703 from makimoto/actionsupport-er...
a8989c2 2013-11-16 Merge pull request #12904 from sbagdat/patch-1
762eca5 2013-11-16 Merge pull request #12906 from chancancode/use_standard_...
1500e4f 2013-11-15 The option is called encode_big_decimal_as_string [ci skip]
514c4d7 2013-11-15 document id prefixed String usage of `.find`. refs #1289...
aae99c9 2013-11-15 Merge pull request #12845 from amatsuda/should_ar_depend...
baeb3e3 2013-11-13 Merge pull request #12870 from sauliusg/atom-feed-doc-fix
3964d08 2013-11-13 Revert "`remove_column` does not take a type argument. [...
6a5e364 2013-11-12 `remove_column` does not take a type argument. [ci skip]...
a54d229 2013-11-12 Merge pull request #12748 from dm1try/fix_counter_cache_...
a64080f 2013-11-11 updated documentation for Integer [ci skip]
5dc1f09 2013-11-11 Update security.md [ci skip]
7c31c74 2013-11-11 Fixed typo in migrations guide [ci skip]
25bf6fb 2013-11-11 tidy Active Record CHANGELOG. [ci skip].
59a99ed 2013-11-11 Merge pull request #12834 from dredozubov/has_one_associ...
b671aea 2013-11-11 Merge pull request #12740 from gaurish/patch-1
b8e648b 2013-11-11 Merge pull request #12749 from iantropov/issue_5303
2bb8493 2013-11-11 Use arel 4-0-stable branch
80fd057 2013-11-10 Fixed minor typo
085a847 2013-11-09 Merge pull request #12825 from huoxito/update-as_json-ex...
60a3705 2013-11-09 Improve wording in AC::ParameterMissing error message
40fa189 2013-11-09 Correct `as_json` return example to display miliseconds
26a2444 2013-11-09 Merge pull request #12821 from arunagw/aa-removed-missle...
86e126d 2013-11-09 Merge pull request #12760 from pseidemann/master
664716b 2013-11-08 Merge pull request #12813 from gaurish/patch-2
c881052 2013-11-08 Update workaround for "Outside the Scope of Strong Param...
cb176b0 2013-11-07 Merge pull request #12791 from jasonayre/ja/fix_autoload...
0693758 2013-11-06 Merge pull request #12788 from kylefritz/patch-1
edf7366 2013-11-06 favicon source shouldn't begin with a slash to reference...
eca3fb1 2013-11-06 Merge pull request #12776 from derekprior/dp-i18n-doc-fix
aabf209 2013-11-04 Backport relation merger updates from 9675c7d to 4-0-stable
a21ce2b 2013-11-04 NullSessionHash#destroy should be a no-op
7061edc 2013-11-04 Merge pull request #12755 from cbartlett/master
1c3c5ca 2013-11-02 Update guides welcome page to point to version 3.2.15 [c...
dbe7629 2013-11-02 Merge pull request #12686 from kryzhovnik/master
c37f767 2013-11-01 Merge branch '4-0-1' into 4-0-stable
61ae5ee 2013-11-01 Merge pull request #12735 from linstula/fix-typo-in-resp...
7a4f67a 2013-10-30 use a thread local rather than a queue so events are in ...
8938e55 2013-10-30 fix code typo in `MysqlAdapter` .Closes #12647.
5feb057 2013-10-30 Merge pull request #12661 from robin850/patch-10
9799c10 2013-10-30 Merge pull request #12656 from dougcole/fix_strong_param...
a0a9058 2013-10-30 Merge pull request #12687 from notalex/master
11088d3 2013-10-29 Merge pull request #12693 from carpodaster/convert-cdata...
91684fb 2013-10-28 use a queue rather than a list. fixes #12069
b7685b5 2013-10-28 Revert "Merge pull request #12633 from senny/no_more_tim...
1fb056e 2013-10-28 Merge pull request #11017 from stormsilver/patch-1
e60c925 2013-10-28 Merge pull request #12633 from senny/no_more_time_zone_l...
0bbc9db 2013-10-27 Assert the return value in the test
9f03c61 2013-10-27 Merge pull request #12664 from jetthoughts/12242_include...
bb22835 2013-10-25 Merge pull request #12648 from chrisledet/patch-1
18780f1 2013-10-25 Use the public API to check the attributes changes
8080ab3 2013-10-25 Merge pull request #12642 from ka8725/fix_usage_for_mode...
d3bc37a 2013-10-25 Merge pull request #12641 from jetthoughts/12640_updated...
7276bb5 2013-10-25 Merge pull request #12621 from laurocaetano/fix_has_one_...
1f3c7fc 2013-10-24 Merge pull request #12636 from kongregate/dont_rescue_Ex...
3dcb238 2013-10-24 Improve the test code for #8422
669b088 2013-10-24 Merge pull request #8491 from igagnidz/master
fc86220 2013-10-24 lock around mutating the generated methods module
714634a 2013-10-24 remove private attribute reader
7d2c414 2013-10-24 Merge pull request #12632 from al2o3cr/fix_race_for_attr...
30efdd6 2013-10-24 define attribute methods in a thread safe manner
9867339 2013-10-24 Add CHANGELOG entry for #12635 [ci skip]
e33aaf4 2013-10-24 Merge pull request #12635 from mperham/4-0-stable
d3ba7a3 2013-10-24 Allow any version of BCrypt
e5e305e 2013-10-24 Merge pull request #12611 from antonio/slice_bang_honor_...
961f00a 2013-10-24 Merge pull request #12629 from Peeja/has_many-pets-typo
7b2f64f 2013-10-23 s/gemcutter/rubygems
7abe000 2013-10-23 Merge pull request #12619 from Veraticus/fix_utils_norma...
7170c3c 2013-10-23 Fix the install task
17a2741 2013-10-23 Merge pull request #12617 from skv-headless/master
1b9d1d9 2013-10-23 Merge pull request #12612 from amatsuda/amo_validates_in...
8143213 2013-10-22 Merge pull request #11574 from jetthoughts/11552_rescue_...
c881df5 2013-10-22 Try arel master
19df5b9 2013-10-22 Fix order dependent tests
51ba5c9 2013-10-22 Merge pull request #11839 from chocoby/fix/convert_port_...
5e8129f 2013-10-21 Merge pull request #12588 from jetthoughts/12586_subquer...
352054e 2013-10-21 Escape the parentheses in the default function regexp
aa6e546 2013-10-21 Merge pull request #12567 from GoBoundless/fix_postgres_...
efbdecc 2013-10-21 Merge pull request #12565 from stormsilver/unscope_fixes
beef637 2013-10-18 Merge pull request #12560 from sue445/modify_find_lock_s...