Merge branch 'ctr-enter-textarea-mac' into 'master'

ctrl+enter on mac correctly submits forms

Closes #4177

See merge request !3089

app/assets/javascripts/behaviors/quick_submit.js.coffee

@@ -24,10 +24,7 @@ keyCodeIs = (e, keyCode) ->
 $(document).on 'keydown.quick_submit', '.js-quick-submit', (e) ->
   return unless keyCodeIs(e, 13) # Enter
 
-  if isMac()
-    return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey)
-  else
-    return unless (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey)
+  return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey) || (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey)
 
   e.preventDefault()