diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-06-25 16:21:13 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-25 16:21:13 +0900 |
commit | 6c3eea0db04be446a1daebf629b6ddf9e0f18d18 (patch) | |
tree | 7de3db2d1addf9ea8e018817c1b8de378d33fb9d /app/assets/javascripts/activities.js | |
parent | 24ba0989878a363c37d86758844a17a99fc7ae0c (diff) | |
parent | 2bac2918b2d6f12d94f739f4b6865b9e9221c642 (diff) | |
download | gitlab-ce-6c3eea0db04be446a1daebf629b6ddf9e0f18d18.tar.gz |
Merge branch 'master' into build-chunks-on-object-storage
Diffstat (limited to 'app/assets/javascripts/activities.js')
-rw-r--r-- | app/assets/javascripts/activities.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/activities.js b/app/assets/javascripts/activities.js index c117d080bda..de4566bb119 100644 --- a/app/assets/javascripts/activities.js +++ b/app/assets/javascripts/activities.js @@ -1,4 +1,4 @@ -/* eslint-disable no-param-reassign, class-methods-use-this */ +/* eslint-disable class-methods-use-this */ import $ from 'jquery'; import Cookies from 'js-cookie'; |