Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cd5896ed
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cd5896ed
编写于
9月 28, 2017
作者:
J
Jacob Schatz
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'jramsay-spelling-occurred' into 'master'
Fix spelling of occurred See merge request gitlab-org/gitlab-ce!14488
上级
3209c071
0ed23790
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
21 addition
and
21 deletion
+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
未找到文件。
app/assets/javascripts/blob/notebook/index.js
浏览文件 @
cd5896ed
...
...
@@ -40,10 +40,10 @@ export default () => {
class="text-center"
v-if="error">
<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 v-else>
An error occured whilst parsing the file.
An error occur
r
ed whilst parsing the file.
</span>
</p>
</div>
...
...
app/assets/javascripts/blob/pdf/index.js
浏览文件 @
cd5896ed
...
...
@@ -48,10 +48,10 @@ export default () => {
class="text-center"
v-if="error">
<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 v-else>
An error occured whilst decoding the file.
An error occur
r
ed whilst decoding the file.
</span>
</p>
</div>
...
...
app/assets/javascripts/boards/components/board_new_issue.js
浏览文件 @
cd5896ed
...
...
@@ -68,7 +68,7 @@ export default {
<div class="flash-container"
v-if="error">
<div class="flash-alert">
An error occured. Please try again.
An error occur
r
ed. Please try again.
</div>
</div>
<label class="label-light"
...
...
app/assets/javascripts/environments/components/environment.vue
浏览文件 @
cd5896ed
...
...
@@ -163,7 +163,7 @@ export default {
this
.
service
.
postAction
(
endpoint
)
.
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
浏览文件 @
cd5896ed
...
...
@@ -158,7 +158,7 @@ export default {
this
.
service
.
postAction
(
endpoint
)
.
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
浏览文件 @
cd5896ed
...
...
@@ -14,7 +14,7 @@ class DropdownEmoji extends gl.FilteredSearchDropdown {
loadingTemplate
:
this
.
loadingTemplate
,
onError
()
{
/* 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 */
},
},
...
...
app/assets/javascripts/filtered_search/dropdown_non_user.js
浏览文件 @
cd5896ed
...
...
@@ -17,7 +17,7 @@ class DropdownNonUser extends gl.FilteredSearchDropdown {
preprocessing
,
onError
()
{
/* 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 */
},
},
...
...
app/assets/javascripts/filtered_search/dropdown_user.js
浏览文件 @
cd5896ed
...
...
@@ -26,7 +26,7 @@ class DropdownUser extends gl.FilteredSearchDropdown {
},
onError
()
{
/* 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 */
},
},
...
...
app/assets/javascripts/filtered_search/filtered_search_manager.js
浏览文件 @
cd5896ed
...
...
@@ -36,7 +36,7 @@ class FilteredSearchManager {
.
catch
((
error
)
=>
{
if
(
error
.
name
===
'
RecentSearchesServiceError
'
)
return
undefined
;
// 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
return
[];
})
...
...
app/assets/javascripts/pipelines/mixins/pipelines.js
浏览文件 @
cd5896ed
...
...
@@ -97,7 +97,7 @@ export default {
postAction
(
endpoint
)
{
this
.
service
.
postAction
(
endpoint
)
.
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
浏览文件 @
cd5896ed
...
...
@@ -44,7 +44,7 @@ export default {
Store
.
submitCommitsLoading
=
true
;
Service
.
commitFiles
(
payload
)
.
then
(
this
.
resetCommitState
)
.
catch
(()
=>
Flash
(
'
An error occured while committing your changes
'
));
.
catch
(()
=>
Flash
(
'
An error occur
r
ed while committing your changes
'
));
},
resetCommitState
()
{
...
...
app/assets/javascripts/repo/components/repo_preview.vue
浏览文件 @
cd5896ed
...
...
@@ -49,7 +49,7 @@ export default {
v-else
class=
"vertical-center render-error"
>
<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>
</div>
</div>
...
...
app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
浏览文件 @
cd5896ed
...
...
@@ -38,7 +38,7 @@ class SidebarMoveIssue {
data
:
(
searchTerm
,
callback
)
=>
{
this
.
mediator
.
fetchAutocompleteProjects
(
searchTerm
)
.
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
=>
`
<li>
...
...
@@ -73,7 +73,7 @@ class SidebarMoveIssue {
this
.
mediator
.
moveIssue
()
.
catch
(()
=>
{
Flash
(
'
An error occured while moving the issue.
'
);
Flash
(
'
An error occur
r
ed while moving the issue.
'
);
this
.
$confirmButton
.
enable
()
.
removeClass
(
'
is-loading
'
);
...
...
app/assets/javascripts/sidebar/sidebar_mediator.js
浏览文件 @
cd5896ed
...
...
@@ -41,7 +41,7 @@ export default class SidebarMediator {
this
.
store
.
setAssigneeData
(
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
)
{
...
...
spec/features/issues/filtered_search/recent_searches_spec.rb
浏览文件 @
cd5896ed
...
...
@@ -104,6 +104,6 @@ describe 'Recent searches', js: true do
set_recent_searches
(
project_1_local_storage_key
,
'fail'
)
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
spec/javascripts/blob/notebook/index_spec.js
浏览文件 @
cd5896ed
...
...
@@ -117,7 +117,7 @@ describe('iPython notebook renderer', () => {
it
(
'
shows error message
'
,
()
=>
{
expect
(
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', () => {
it
(
'
shows error message
'
,
()
=>
{
expect
(
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
浏览文件 @
cd5896ed
...
...
@@ -76,7 +76,7 @@ describe('PDF renderer', () => {
it
(
'
shows error message
'
,
()
=>
{
expect
(
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.
'
);
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录