diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-05-15 12:58:20 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-05-15 12:58:20 +0000 |
commit | 709ce8a4eccc1e3839d613dc9dff92d477d06df2 (patch) | |
tree | e8bcefc5c536da59e8389be04f5d62d5d5682069 /app | |
parent | 1a02638e39393f3ac2f690590a2fde5549f06fd5 (diff) | |
parent | 787b314e38a2002f5e7a2aeb9596530270c0e76a (diff) | |
download | gitlab-ce-709ce8a4eccc1e3839d613dc9dff92d477d06df2.tar.gz |
Merge branch 'dz-fix-file-mode' into 'master'
Ruby files that are not meant to be executable should be 644 not 755
See merge request !11369
Diffstat (limited to 'app')
-rw-r--r--[-rwxr-xr-x] | app/controllers/projects/merge_requests_controller.rb | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index b99ccd453b8..b99ccd453b8 100755..100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb |