diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 21:08:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 21:08:19 +0300 |
| commit | a8de96bff51846e160b76506dc0ca0fe6f767f64 (patch) | |
| tree | 1036f1ca75aba492eaaa3439c84a3109b4684896 /app/helpers | |
| parent | afe2b984524ae4b0c8a0636db7ec5b2c452f0734 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/analytics_navbar_helper.rb | 6 | ||||
| -rw-r--r-- | app/helpers/issuables_helper.rb | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/helpers/analytics_navbar_helper.rb b/app/helpers/analytics_navbar_helper.rb index 021b9bb10cd..eecb4090bcf 100644 --- a/app/helpers/analytics_navbar_helper.rb +++ b/app/helpers/analytics_navbar_helper.rb @@ -35,7 +35,7 @@ module AnalyticsNavbarHelper return unless project_nav_tab?(:cycle_analytics) navbar_sub_item( - title: _('Value Stream Analytics'), + title: _('Value Stream'), path: 'cycle_analytics#show', link: project_cycle_analytics_path(project), link_to_options: { class: 'shortcuts-project-cycle-analytics' } @@ -47,7 +47,7 @@ module AnalyticsNavbarHelper return if project.empty_repo? navbar_sub_item( - title: _('Repository Analytics'), + title: _('Repository'), path: 'graphs#charts', link: charts_project_graph_path(project, current_ref), link_to_options: { class: 'shortcuts-repository-charts' } @@ -60,7 +60,7 @@ module AnalyticsNavbarHelper return unless project.feature_available?(:builds, current_user) || !project.empty_repo? navbar_sub_item( - title: _('CI / CD Analytics'), + title: _('CI / CD'), path: 'pipelines#charts', link: charts_project_pipelines_path(project) ) diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 8c75a4a13e8..aa05076c43e 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -463,6 +463,7 @@ module IssuablesHelper currentUser: issuable[:current_user], rootPath: root_path, fullPath: issuable[:project_full_path], + id: issuable[:id], timeTrackingLimitToHours: Gitlab::CurrentSettings.time_tracking_limit_to_hours } end |