diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-18 19:00:44 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-18 19:00:44 +0300 |
| commit | a3506a228723d7e31fb37580dcd3b30245436f22 (patch) | |
| tree | 3ecfc67db826434ba6e472c8d21e3d12d4371946 | |
| parent | 372841975feace348ffdcc14819b9c9a9da8b181 (diff) | |
Fixed missing text
Fixed duplicated time in dropdown
| -rw-r--r-- | app/views/projects/cycle_analytics/show.html.haml | 4 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml index a0a629eaa41..a7783b69588 100644 --- a/app/views/projects/cycle_analytics/show.html.haml +++ b/app/views/projects/cycle_analytics/show.html.haml @@ -26,7 +26,7 @@ .wrapper{ "v-show" => "!isLoading && !hasError" } .panel.panel-default .panel-heading - Pipeline Health + {{ 'Pipeline Health' | translate }} .content-block .container-fluid .row @@ -44,7 +44,7 @@ {{ 'Last 30 days' | translate }} %li %a{ "href" => "#", "data-value" => "90" } - {{ 'Last 30 days' | translate }} + {{ 'Last 90 days' | translate }} .stage-panel-container .panel.panel-default.stage-panel .panel-heading diff --git a/config/webpack.config.js b/config/webpack.config.js index 92ecba45d6e..f93f4d6cd5e 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -34,6 +34,7 @@ var config = { graphs: './graphs/graphs_bundle.js', groups_list: './groups_list.js', issuable: './issuable/issuable_bundle.js', + locale: './locale/index.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', merge_request_widget: './merge_request_widget/ci_bundle.js', monitoring: './monitoring/monitoring_bundle.js', @@ -52,7 +53,6 @@ var config = { vue_pipelines: './vue_pipelines_index/index.js', issue_show: './issue_show/index.js', group: './group.js', - locale: './locale/index.js', }, output: { |