aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-09-14 20:14:26 +0200
committerGitHub <noreply@github.com>2017-09-14 20:14:26 +0200
commit43fbfb483ff72c69f6630fd110f44ae7802bdabc (patch)
tree0274147578ee48f0fee61ab027c1e568333250ad /activerecord/lib/active_record/relation/merger.rb
parentcffa32f95d2934cfafc22958f35552ee6e7c195e (diff)
parentd5d41c82810f96ee7ab5a34aeb75b46fe407a596 (diff)
downloadrails-43fbfb483ff72c69f6630fd110f44ae7802bdabc.tar.gz
rails-43fbfb483ff72c69f6630fd110f44ae7802bdabc.tar.bz2
rails-43fbfb483ff72c69f6630fd110f44ae7802bdabc.zip
Merge pull request #30581 from y-yagi/do_not_add_master_key_twice_to_gitignore
Make master key added to gitignore the same value as when creating appplication
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
0 files changed, 0 insertions, 0 deletions