diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-04 15:14:53 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-04 15:14:53 +0300 |
| commit | c48f29c15989d260ccb72d3e4bf5973a5e0f2d25 (patch) | |
| tree | 9c87aff4904e5a34a07258264db1ec4950be653d /app | |
| parent | 96fdcbacf74fffc4c9389d3d122db1cdf01693d2 (diff) | |
| parent | 1af8605256b145bcd8467f120512a6d6aa432afc (diff) | |
Merge branch 'patch-29' into 'master'
accured -> occurred, as suggested in…
See merge request gitlab-org/gitlab-ce!23629
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/ide/stores/modules/commit/actions.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js index d97a950a8b2..24c2f71ae2b 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/actions.js +++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js @@ -202,7 +202,7 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo dispatch( 'setErrorMessage', { - text: __('An error accured whilst committing your changes.'), + text: __('An error occurred whilst committing your changes.'), action: () => dispatch('commitChanges').then(() => dispatch('setErrorMessage', null, { root: true }), |