diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-20 16:20:46 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-20 16:20:46 +0000 |
| commit | 6de494007769218de760cf31216f2b295e38ab9a (patch) | |
| tree | 5629a9e34651c6e4ff98addef1e30f65553c509f | |
| parent | 09309d78bc4148968b0f3870a6bcf5d40ab0cbf6 (diff) | |
| parent | ef2b8a44b5bdb88227c2047840439b21d55efe8f (diff) | |
| download | gitlab-ce-6de494007769218de760cf31216f2b295e38ab9a.tar.gz | |
Merge branch 'remove-pretty-time' into 'master'
Remove pretty time from main.js
See merge request gitlab-org/gitlab-ce!15459
| -rw-r--r-- | app/assets/javascripts/main.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index cef79eec273..f97c95a9d9f 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -29,7 +29,6 @@ import './commit/image_file'; // lib/utils import { handleLocationHash } from './lib/utils/common_utils'; import './lib/utils/datetime_utility'; -import './lib/utils/pretty_time'; import './lib/utils/url_utility'; // behaviors |