Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0ed23790
Commit
0ed23790
authored
Sep 25, 2017
by
James Ramsay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spelling of occurred
parent
6b45a012
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
21 additions
and
21 deletions
+21
-21
app/assets/javascripts/blob/notebook/index.js
app/assets/javascripts/blob/notebook/index.js
+2
-2
app/assets/javascripts/blob/pdf/index.js
app/assets/javascripts/blob/pdf/index.js
+2
-2
app/assets/javascripts/boards/components/board_new_issue.js
app/assets/javascripts/boards/components/board_new_issue.js
+1
-1
app/assets/javascripts/environments/components/environment.vue
...ssets/javascripts/environments/components/environment.vue
+1
-1
app/assets/javascripts/environments/folder/environments_folder_view.vue
...ascripts/environments/folder/environments_folder_view.vue
+1
-1
app/assets/javascripts/filtered_search/dropdown_emoji.js
app/assets/javascripts/filtered_search/dropdown_emoji.js
+1
-1
app/assets/javascripts/filtered_search/dropdown_non_user.js
app/assets/javascripts/filtered_search/dropdown_non_user.js
+1
-1
app/assets/javascripts/filtered_search/dropdown_user.js
app/assets/javascripts/filtered_search/dropdown_user.js
+1
-1
app/assets/javascripts/filtered_search/filtered_search_manager.js
...ts/javascripts/filtered_search/filtered_search_manager.js
+1
-1
app/assets/javascripts/pipelines/mixins/pipelines.js
app/assets/javascripts/pipelines/mixins/pipelines.js
+1
-1
app/assets/javascripts/repo/components/repo_commit_section.vue
...ssets/javascripts/repo/components/repo_commit_section.vue
+1
-1
app/assets/javascripts/repo/components/repo_preview.vue
app/assets/javascripts/repo/components/repo_preview.vue
+1
-1
app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
+2
-2
app/assets/javascripts/sidebar/sidebar_mediator.js
app/assets/javascripts/sidebar/sidebar_mediator.js
+1
-1
spec/features/issues/filtered_search/recent_searches_spec.rb
spec/features/issues/filtered_search/recent_searches_spec.rb
+1
-1
spec/javascripts/blob/notebook/index_spec.js
spec/javascripts/blob/notebook/index_spec.js
+2
-2
spec/javascripts/blob/pdf/index_spec.js
spec/javascripts/blob/pdf/index_spec.js
+1
-1
No files found.
app/assets/javascripts/blob/notebook/index.js
View file @
0ed23790
...
@@ -40,10 +40,10 @@ export default () => {
...
@@ -40,10 +40,10 @@ export default () => {
class="text-center"
class="text-center"
v-if="error">
v-if="error">
<span v-if="loadError">
<span v-if="loadError">
An error occured whilst loading the file. Please try again later.
An error occur
r
ed whilst loading the file. Please try again later.
</span>
</span>
<span v-else>
<span v-else>
An error occured whilst parsing the file.
An error occur
r
ed whilst parsing the file.
</span>
</span>
</p>
</p>
</div>
</div>
...
...
app/assets/javascripts/blob/pdf/index.js
View file @
0ed23790
...
@@ -48,10 +48,10 @@ export default () => {
...
@@ -48,10 +48,10 @@ export default () => {
class="text-center"
class="text-center"
v-if="error">
v-if="error">
<span v-if="loadError">
<span v-if="loadError">
An error occured whilst loading the file. Please try again later.
An error occur
r
ed whilst loading the file. Please try again later.
</span>
</span>
<span v-else>
<span v-else>
An error occured whilst decoding the file.
An error occur
r
ed whilst decoding the file.
</span>
</span>
</p>
</p>
</div>
</div>
...
...
app/assets/javascripts/boards/components/board_new_issue.js
View file @
0ed23790
...
@@ -68,7 +68,7 @@ export default {
...
@@ -68,7 +68,7 @@ export default {
<div class="flash-container"
<div class="flash-container"
v-if="error">
v-if="error">
<div class="flash-alert">
<div class="flash-alert">
An error occured. Please try again.
An error occur
r
ed. Please try again.
</div>
</div>
</div>
</div>
<label class="label-light"
<label class="label-light"
...
...
app/assets/javascripts/environments/components/environment.vue
View file @
0ed23790
...
@@ -163,7 +163,7 @@ export default {
...
@@ -163,7 +163,7 @@ export default {
this
.
service
.
postAction
(
endpoint
)
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
this
.
fetchEnvironments
())
.
then
(()
=>
this
.
fetchEnvironments
())
.
catch
(()
=>
new
Flash
(
'
An error occured while making the request.
'
));
.
catch
(()
=>
new
Flash
(
'
An error occur
r
ed while making the request.
'
));
}
}
},
},
...
...
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @
0ed23790
...
@@ -158,7 +158,7 @@ export default {
...
@@ -158,7 +158,7 @@ export default {
this
.
service
.
postAction
(
endpoint
)
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
this
.
fetchEnvironments
())
.
then
(()
=>
this
.
fetchEnvironments
())
.
catch
(()
=>
new
Flash
(
'
An error occured while making the request.
'
));
.
catch
(()
=>
new
Flash
(
'
An error occur
r
ed while making the request.
'
));
}
}
},
},
},
},
...
...
app/assets/javascripts/filtered_search/dropdown_emoji.js
View file @
0ed23790
...
@@ -14,7 +14,7 @@ class DropdownEmoji extends gl.FilteredSearchDropdown {
...
@@ -14,7 +14,7 @@ class DropdownEmoji extends gl.FilteredSearchDropdown {
loadingTemplate
:
this
.
loadingTemplate
,
loadingTemplate
:
this
.
loadingTemplate
,
onError
()
{
onError
()
{
/* eslint-disable no-new */
/* eslint-disable no-new */
new
Flash
(
'
An error occured fetching the dropdown data.
'
);
new
Flash
(
'
An error occur
r
ed fetching the dropdown data.
'
);
/* eslint-enable no-new */
/* eslint-enable no-new */
},
},
},
},
...
...
app/assets/javascripts/filtered_search/dropdown_non_user.js
View file @
0ed23790
...
@@ -17,7 +17,7 @@ class DropdownNonUser extends gl.FilteredSearchDropdown {
...
@@ -17,7 +17,7 @@ class DropdownNonUser extends gl.FilteredSearchDropdown {
preprocessing
,
preprocessing
,
onError
()
{
onError
()
{
/* eslint-disable no-new */
/* eslint-disable no-new */
new
Flash
(
'
An error occured fetching the dropdown data.
'
);
new
Flash
(
'
An error occur
r
ed fetching the dropdown data.
'
);
/* eslint-enable no-new */
/* eslint-enable no-new */
},
},
},
},
...
...
app/assets/javascripts/filtered_search/dropdown_user.js
View file @
0ed23790
...
@@ -26,7 +26,7 @@ class DropdownUser extends gl.FilteredSearchDropdown {
...
@@ -26,7 +26,7 @@ class DropdownUser extends gl.FilteredSearchDropdown {
},
},
onError
()
{
onError
()
{
/* eslint-disable no-new */
/* eslint-disable no-new */
new
Flash
(
'
An error occured fetching the dropdown data.
'
);
new
Flash
(
'
An error occur
r
ed fetching the dropdown data.
'
);
/* eslint-enable no-new */
/* eslint-enable no-new */
},
},
},
},
...
...
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @
0ed23790
...
@@ -36,7 +36,7 @@ class FilteredSearchManager {
...
@@ -36,7 +36,7 @@ class FilteredSearchManager {
.
catch
((
error
)
=>
{
.
catch
((
error
)
=>
{
if
(
error
.
name
===
'
RecentSearchesServiceError
'
)
return
undefined
;
if
(
error
.
name
===
'
RecentSearchesServiceError
'
)
return
undefined
;
// eslint-disable-next-line no-new
// eslint-disable-next-line no-new
new
window
.
Flash
(
'
An error occured while parsing recent searches
'
);
new
window
.
Flash
(
'
An error occur
r
ed while parsing recent searches
'
);
// Gracefully fail to empty array
// Gracefully fail to empty array
return
[];
return
[];
})
})
...
...
app/assets/javascripts/pipelines/mixins/pipelines.js
View file @
0ed23790
...
@@ -97,7 +97,7 @@ export default {
...
@@ -97,7 +97,7 @@ export default {
postAction
(
endpoint
)
{
postAction
(
endpoint
)
{
this
.
service
.
postAction
(
endpoint
)
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
eventHub
.
$emit
(
'
refreshPipelines
'
))
.
then
(()
=>
eventHub
.
$emit
(
'
refreshPipelines
'
))
.
catch
(()
=>
new
Flash
(
'
An error occured while making the request.
'
));
.
catch
(()
=>
new
Flash
(
'
An error occur
r
ed while making the request.
'
));
},
},
},
},
};
};
app/assets/javascripts/repo/components/repo_commit_section.vue
View file @
0ed23790
...
@@ -44,7 +44,7 @@ export default {
...
@@ -44,7 +44,7 @@ export default {
Store
.
submitCommitsLoading
=
true
;
Store
.
submitCommitsLoading
=
true
;
Service
.
commitFiles
(
payload
)
Service
.
commitFiles
(
payload
)
.
then
(
this
.
resetCommitState
)
.
then
(
this
.
resetCommitState
)
.
catch
(()
=>
Flash
(
'
An error occured while committing your changes
'
));
.
catch
(()
=>
Flash
(
'
An error occur
r
ed while committing your changes
'
));
},
},
resetCommitState
()
{
resetCommitState
()
{
...
...
app/assets/javascripts/repo/components/repo_preview.vue
View file @
0ed23790
...
@@ -45,7 +45,7 @@ export default {
...
@@ -45,7 +45,7 @@ export default {
v-else
v-else
class=
"vertical-center render-error"
>
class=
"vertical-center render-error"
>
<p
class=
"text-center"
>
<p
class=
"text-center"
>
The source could not be displayed because a rendering error occured. You can
<a
:href=
"activeFile.raw_path"
>
download
</a>
it instead.
The source could not be displayed because a rendering error occur
r
ed. You can
<a
:href=
"activeFile.raw_path"
>
download
</a>
it instead.
</p>
</p>
</div>
</div>
</div>
</div>
...
...
app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
View file @
0ed23790
...
@@ -38,7 +38,7 @@ class SidebarMoveIssue {
...
@@ -38,7 +38,7 @@ class SidebarMoveIssue {
data
:
(
searchTerm
,
callback
)
=>
{
data
:
(
searchTerm
,
callback
)
=>
{
this
.
mediator
.
fetchAutocompleteProjects
(
searchTerm
)
this
.
mediator
.
fetchAutocompleteProjects
(
searchTerm
)
.
then
(
callback
)
.
then
(
callback
)
.
catch
(()
=>
new
Flash
(
'
An error occured while fetching projects autocomplete.
'
));
.
catch
(()
=>
new
Flash
(
'
An error occur
r
ed while fetching projects autocomplete.
'
));
},
},
renderRow
:
project
=>
`
renderRow
:
project
=>
`
<li>
<li>
...
@@ -73,7 +73,7 @@ class SidebarMoveIssue {
...
@@ -73,7 +73,7 @@ class SidebarMoveIssue {
this
.
mediator
.
moveIssue
()
this
.
mediator
.
moveIssue
()
.
catch
(()
=>
{
.
catch
(()
=>
{
Flash
(
'
An error occured while moving the issue.
'
);
Flash
(
'
An error occur
r
ed while moving the issue.
'
);
this
.
$confirmButton
this
.
$confirmButton
.
enable
()
.
enable
()
.
removeClass
(
'
is-loading
'
);
.
removeClass
(
'
is-loading
'
);
...
...
app/assets/javascripts/sidebar/sidebar_mediator.js
View file @
0ed23790
...
@@ -41,7 +41,7 @@ export default class SidebarMediator {
...
@@ -41,7 +41,7 @@ export default class SidebarMediator {
this
.
store
.
setAssigneeData
(
data
);
this
.
store
.
setAssigneeData
(
data
);
this
.
store
.
setTimeTrackingData
(
data
);
this
.
store
.
setTimeTrackingData
(
data
);
})
})
.
catch
(()
=>
new
Flash
(
'
Error occured when fetching sidebar data
'
));
.
catch
(()
=>
new
Flash
(
'
Error occur
r
ed when fetching sidebar data
'
));
}
}
fetchAutocompleteProjects
(
searchTerm
)
{
fetchAutocompleteProjects
(
searchTerm
)
{
...
...
spec/features/issues/filtered_search/recent_searches_spec.rb
View file @
0ed23790
...
@@ -104,6 +104,6 @@ describe 'Recent searches', js: true do
...
@@ -104,6 +104,6 @@ describe 'Recent searches', js: true do
set_recent_searches
(
project_1_local_storage_key
,
'fail'
)
set_recent_searches
(
project_1_local_storage_key
,
'fail'
)
visit
project_issues_path
(
project_1
)
visit
project_issues_path
(
project_1
)
expect
(
find
(
'.flash-alert'
)).
to
have_text
(
'An error occured while parsing recent searches'
)
expect
(
find
(
'.flash-alert'
)).
to
have_text
(
'An error occur
r
ed while parsing recent searches'
)
end
end
end
end
spec/javascripts/blob/notebook/index_spec.js
View file @
0ed23790
...
@@ -117,7 +117,7 @@ describe('iPython notebook renderer', () => {
...
@@ -117,7 +117,7 @@ describe('iPython notebook renderer', () => {
it
(
'
shows error message
'
,
()
=>
{
it
(
'
shows error message
'
,
()
=>
{
expect
(
expect
(
document
.
querySelector
(
'
.md
'
).
textContent
.
trim
(),
document
.
querySelector
(
'
.md
'
).
textContent
.
trim
(),
).
toBe
(
'
An error occured whilst parsing the file.
'
);
).
toBe
(
'
An error occur
r
ed whilst parsing the file.
'
);
});
});
});
});
...
@@ -153,7 +153,7 @@ describe('iPython notebook renderer', () => {
...
@@ -153,7 +153,7 @@ describe('iPython notebook renderer', () => {
it
(
'
shows error message
'
,
()
=>
{
it
(
'
shows error message
'
,
()
=>
{
expect
(
expect
(
document
.
querySelector
(
'
.md
'
).
textContent
.
trim
(),
document
.
querySelector
(
'
.md
'
).
textContent
.
trim
(),
).
toBe
(
'
An error occured whilst loading the file. Please try again later.
'
);
).
toBe
(
'
An error occur
r
ed whilst loading the file. Please try again later.
'
);
});
});
});
});
});
});
spec/javascripts/blob/pdf/index_spec.js
View file @
0ed23790
...
@@ -76,7 +76,7 @@ describe('PDF renderer', () => {
...
@@ -76,7 +76,7 @@ describe('PDF renderer', () => {
it
(
'
shows error message
'
,
()
=>
{
it
(
'
shows error message
'
,
()
=>
{
expect
(
expect
(
document
.
querySelector
(
'
.md
'
).
textContent
.
trim
(),
document
.
querySelector
(
'
.md
'
).
textContent
.
trim
(),
).
toBe
(
'
An error occured whilst loading the file. Please try again later.
'
);
).
toBe
(
'
An error occur
r
ed whilst loading the file. Please try again later.
'
);
});
});
});
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment