diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-08-16 17:45:15 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-08-16 17:45:15 +0000 |
| commit | 76cd1dd68198bb464b12de7525ab067c6d4dc025 (patch) | |
| tree | 3712e63de04a074d70280f1dd5420a35c77a649c /app | |
| parent | 1a7ecf03944050b9f0126bde9767481d7e8d3ec2 (diff) | |
| parent | 182f1eeb27d63541141f339b54501cc821b8e0e9 (diff) | |
| download | gitlab-ce-76cd1dd68198bb464b12de7525ab067c6d4dc025.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 |