diff options
author | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
---|---|---|
committer | Dennis Tang <dtang@gitlab.com> | 2018-06-21 11:48:25 +0300 |
commit | 0e7f8fd5bd7ed184b8a12039739200065ffa2dbd (patch) | |
tree | 07b3c3bbcc0d05848ab7034d2ed32a801f8786b9 /app/assets/javascripts/merge_request.js | |
parent | 203d1026008effeeba5c1f98dba768448473f9fe (diff) | |
parent | 904cbe0132a1caf0dbb7efb8bdc70398d1d82289 (diff) |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
Diffstat (limited to 'app/assets/javascripts/merge_request.js')
-rw-r--r-- | app/assets/javascripts/merge_request.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js index d8222ebec63..83decc1d298 100644 --- a/app/assets/javascripts/merge_request.js +++ b/app/assets/javascripts/merge_request.js @@ -1,4 +1,4 @@ -/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, quotes, no-underscore-dangle, one-var, one-var-declaration-per-line, consistent-return, dot-notation, quote-props, comma-dangle, object-shorthand, max-len, prefer-arrow-callback */ +/* eslint-disable func-names, no-var, wrap-iife, quotes, no-underscore-dangle, one-var, one-var-declaration-per-line, consistent-return, comma-dangle, max-len, prefer-arrow-callback */ import $ from 'jquery'; import { __ } from '~/locale'; |