aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-08-27 14:03:29 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-08-27 14:06:13 -0700
commit59a35610459da7368e79179c9d33bc6e4697adb1 (patch)
treecd09fd43ca884569a8f9efd78b03c2b63ab34374 /railties
parente0fc5da35393c70d5ac61aaa96705f03195486fc (diff)
downloadrails-59a35610459da7368e79179c9d33bc6e4697adb1.tar.gz
rails-59a35610459da7368e79179c9d33bc6e4697adb1.tar.bz2
rails-59a35610459da7368e79179c9d33bc6e4697adb1.zip
Merge pull request #12048 from tjouan/app_generator-bin_perms-umask
Comply with current umask when generating new app Conflicts: railties/lib/rails/generators/rails/app/app_generator.rb
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 2a6bd57df4..cd9372ad2f 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -103,7 +103,7 @@ module Rails
directory "script" do |content|
"#{shebang}\n" + content
end
- chmod "script", 0755, :verbose => false
+ chmod "script", 0755 & ~File.umask, :verbose => false
end
def test