summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-05-25 12:21:42 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-05-25 12:21:42 +0000
commit4e257213343673a71a81332e5f5703bfb3043a4f (patch)
tree711d187e5930922f99be96a88a7f672f2ae32262 /app/assets
parentd6a7a111ff3cc0bd4681615fc97c7b2a90729444 (diff)
parent10350c2e4f8185452fe51cb8e41c8dc7231da7af (diff)
downloadgitlab-ce-4e257213343673a71a81332e5f5703bfb3043a4f.tar.gz
Merge branch '46768-typo-on-the-empty-pipelines-page' into 'master'
Resolve "Typo on the empty Pipelines page" Closes #46768 See merge request gitlab-org/gitlab-ce!19140
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/pipelines/components/empty_state.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipelines/components/empty_state.vue b/app/assets/javascripts/pipelines/components/empty_state.vue
index 10ac8c08bed..6083421073e 100644
--- a/app/assets/javascripts/pipelines/components/empty_state.vue
+++ b/app/assets/javascripts/pipelines/components/empty_state.vue
@@ -34,7 +34,7 @@
</h4>
<p>
- {{ s__(`Pipelines|Continous Integration can help
+ {{ s__(`Pipelines|Continuous Integration can help
catch bugs by running your tests automatically,
while Continuous Deployment can help you deliver
code to your product environment.`) }}