diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-08-16 17:45:15 +0000 |
|---|---|---|
| committer | Julius Kvedaras <juliuskvedaras@yahoo.ie> | 2018-08-17 10:38:08 +0100 |
| commit | 1cb68dc8af05098305893df94b1bc10e3cff0894 (patch) | |
| tree | a548eca89e61ce81eacf76676e0f92e76f6e3fc8 /app | |
| parent | efc1ecf0e06216f9bb20d942e20e144f7bd7e598 (diff) | |
| download | gitlab-ce-1cb68dc8af05098305893df94b1bc10e3cff0894.tar.gz | |
Merge branch '50312-instance-statistics-convdev-index-intro-banner-is-not-dismissable' into 'master'
Resolve "Instance Statistics: ConvDev index intro banner is not dismissable"
Closes #50312
See merge request gitlab-org/gitlab-ce!21211
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/pages/instance_statistics/cohorts/index.js (renamed from app/assets/javascripts/pages/admin/cohorts/index.js) | 0 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js (renamed from app/assets/javascripts/pages/admin/cohorts/usage_ping.js) | 0 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js (renamed from app/assets/javascripts/pages/admin/conversational_development_index/show/index.js) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/admin/cohorts/index.js b/app/assets/javascripts/pages/instance_statistics/cohorts/index.js index 2d5020dbef4..2d5020dbef4 100644 --- a/app/assets/javascripts/pages/admin/cohorts/index.js +++ b/app/assets/javascripts/pages/instance_statistics/cohorts/index.js diff --git a/app/assets/javascripts/pages/admin/cohorts/usage_ping.js b/app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js index 914a9661c27..914a9661c27 100644 --- a/app/assets/javascripts/pages/admin/cohorts/usage_ping.js +++ b/app/assets/javascripts/pages/instance_statistics/cohorts/usage_ping.js diff --git a/app/assets/javascripts/pages/admin/conversational_development_index/show/index.js b/app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js index c1056537f90..c1056537f90 100644 --- a/app/assets/javascripts/pages/admin/conversational_development_index/show/index.js +++ b/app/assets/javascripts/pages/instance_statistics/conversational_development_index/index.js |