diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-05 02:51:18 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-05 02:51:18 +0300 |
| commit | 7fd42698aae14c8d0a064716f90274f1de54e496 (patch) | |
| tree | 552d6f47cde2ab29571b09fdc5a97c3b1dc70ee6 /lib/gitlab/cycle_analytics | |
| parent | b396668ec55fb866ef578e5f0e60df8b13519613 (diff) | |
| parent | bacf652a3794c4da71312982b7617542363c1441 (diff) | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Conflicts:
lib/gitlab/cycle_analytics/review_stage.rb
lib/gitlab/cycle_analytics/staging_stage.rb
lib/gitlab/cycle_analytics/test_stage.rb
Diffstat (limited to 'lib/gitlab/cycle_analytics')
| -rw-r--r-- | lib/gitlab/cycle_analytics/review_stage.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/cycle_analytics/staging_stage.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/cycle_analytics/test_stage.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/cycle_analytics/review_stage.rb b/lib/gitlab/cycle_analytics/review_stage.rb index 2cab363ba9d..0642e1ce32f 100644 --- a/lib/gitlab/cycle_analytics/review_stage.rb +++ b/lib/gitlab/cycle_analytics/review_stage.rb @@ -18,7 +18,7 @@ module Gitlab end def legend - _("Relative Merged Requests") + "Related Merged Requests" end def description diff --git a/lib/gitlab/cycle_analytics/staging_stage.rb b/lib/gitlab/cycle_analytics/staging_stage.rb index c1753340842..d5c7d3f915a 100644 --- a/lib/gitlab/cycle_analytics/staging_stage.rb +++ b/lib/gitlab/cycle_analytics/staging_stage.rb @@ -19,7 +19,7 @@ module Gitlab end def legend - _("Relative Deployed Builds") + "Related Deployed Jobs" end def description diff --git a/lib/gitlab/cycle_analytics/test_stage.rb b/lib/gitlab/cycle_analytics/test_stage.rb index 10402a1d7cd..956ee9b8b74 100644 --- a/lib/gitlab/cycle_analytics/test_stage.rb +++ b/lib/gitlab/cycle_analytics/test_stage.rb @@ -18,7 +18,7 @@ module Gitlab end def legend - _("Relative Builds Trigger by Commits") + "Related Jobs" end def description |