diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-17 13:28:14 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-17 13:28:14 +0000 |
| commit | 1bd140ca3afae608d07be7d2f004d71a5d19c10f (patch) | |
| tree | db0c4936e0ead770f45d732a49cdc07cac8e1b0e | |
| parent | 5c4f99a360aaeb5dc5c95d7e14f56a7cc23f2b29 (diff) | |
| parent | a8f22ddf128a087e4a86063b50f3634ad51e89b0 (diff) | |
| download | gitlab-ce-1bd140ca3afae608d07be7d2f004d71a5d19c10f.tar.gz | |
Merge branch '35164-cycle-analytics-firefox' into 'master'
move click handler to button. when on the icon it wasn't triggered in firefox
Closes #35164
See merge request !12905
| -rw-r--r-- | app/views/projects/cycle_analytics/show.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/35164-cycle-analytics-firefox.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml index 7000b289f75..7e7b7335597 100644 --- a/app/views/projects/cycle_analytics/show.html.haml +++ b/app/views/projects/cycle_analytics/show.html.haml @@ -9,8 +9,8 @@ #cycle-analytics{ class: container_class, "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project) } } - if @cycle_analytics_no_data .landing.content-block{ "v-if" => "!isOverviewDialogDismissed" } - %button.dismiss-button{ type: 'button', 'aria-label': 'Dismiss Cycle Analytics introduction box' } - = icon("times", "@click" => "dismissOverviewDialog()") + %button.dismiss-button{ type: 'button', 'aria-label': 'Dismiss Cycle Analytics introduction box', "@click" => "dismissOverviewDialog()" } + = icon("times") .svg-container = custom_icon('icon_cycle_analytics_splash') .inner-content diff --git a/changelogs/unreleased/35164-cycle-analytics-firefox.yml b/changelogs/unreleased/35164-cycle-analytics-firefox.yml new file mode 100644 index 00000000000..0b7115136ca --- /dev/null +++ b/changelogs/unreleased/35164-cycle-analytics-firefox.yml @@ -0,0 +1,4 @@ +--- +title: allow closing Cycle Analytics intro box in firefox +merge_request: +author: |