Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2ee2daa4
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,体验更适合开发者的 AI 搜索 >>
提交
2ee2daa4
编写于
1月 13, 2017
作者:
M
Mike Greiling
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
more post-merge fixes
上级
fc4fcf33
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
24 addition
and
26 deletion
+24
-26
app/assets/javascripts/application.js
app/assets/javascripts/application.js
+1
-1
app/assets/javascripts/vue_pipelines_index/index.js.es6
app/assets/javascripts/vue_pipelines_index/index.js.es6
+1
-1
config/webpack.config.js
config/webpack.config.js
+1
-1
spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
+4
-4
spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js.es6
...tered_search/filtered_search_dropdown_manager_spec.js.es6
+3
-3
spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
...ts/filtered_search/filtered_search_token_keys_spec.js.es6
+2
-2
spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6
...pts/filtered_search/filtered_search_tokenizer_spec.js.es6
+3
-3
spec/javascripts/lib/utils/text_utility_spec.js.es6
spec/javascripts/lib/utils/text_utility_spec.js.es6
+1
-1
spec/javascripts/vue_pagination/pagination_spec.js.es6
spec/javascripts/vue_pagination/pagination_spec.js.es6
+8
-10
未找到文件。
app/assets/javascripts/application.js
浏览文件 @
2ee2daa4
...
...
@@ -54,8 +54,8 @@ requireAll(require.context('./commit', false, /^\.\/.*\.(js|es6)$/));
requireAll
(
require
.
context
(
'
./extensions
'
,
false
,
/^
\.\/
.*
\.(
js|es6
)
$/
));
requireAll
(
require
.
context
(
'
./lib/utils
'
,
false
,
/^
\.\/
.*
\.(
js|es6
)
$/
));
requireAll
(
require
.
context
(
'
./u2f
'
,
false
,
/^
\.\/
.*
\.(
js|es6
)
$/
));
requireAll
(
require
.
context
(
'
.
'
,
false
,
/^
\.\/(?!
application
)
.*
\.(
js|es6
)
$/
));
requireAll
(
require
.
context
(
'
./droplab
'
,
false
,
/^
\.\/
.*
\.(
js|es6
)
$/
));
requireAll
(
require
.
context
(
'
.
'
,
false
,
/^
\.\/(?!
application
)
.*
\.(
js|es6
)
$/
));
require
(
'
vendor/fuzzaldrin-plus
'
);
window
.
ES6Promise
=
require
(
'
vendor/es6-promise.auto
'
);
window
.
ES6Promise
.
polyfill
();
...
...
app/assets/javascripts/vue_pipelines_index/index.js.es6
浏览文件 @
2ee2daa4
/* global Vue, VueResource, gl */
window.Vue = require('vue');
window.Vue.use(require('vue-resource'));
require('../vue_common_component/commit')
require('../vue_common_component/commit')
;
require('../boards/vue_resource_interceptor');
require('./status');
require('./store');
...
...
config/webpack.config.js
浏览文件 @
2ee2daa4
...
...
@@ -35,7 +35,7 @@ var config = {
lib_chart
:
'
./lib/chart.js
'
,
lib_d3
:
'
./lib/d3.js
'
,
vue_pagination
:
'
./vue_pagination/index.js
'
,
vue_pipelines
:
'
./vue_pipelines_index/index.js
'
,
vue_pipelines
:
'
./vue_pipelines_index/index.js
'
,
},
output
:
{
...
...
spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
浏览文件 @
2ee2daa4
//= require extensions/array
//= require filtered_search/dropdown_utils
//= require filtered_search/filtered_search_tokenizer
//= require filtered_search/filtered_search_dropdown_manager
require('~/extensions/array');
require('~/filtered_search/dropdown_utils');
require('~/filtered_search/filtered_search_tokenizer');
require('~/filtered_search/filtered_search_dropdown_manager');
(() => {
describe('Dropdown Utils', () => {
...
...
spec/javascripts/filtered_search/filtered_search_dropdown_manager_spec.js.es6
浏览文件 @
2ee2daa4
//= require extensions/array
//= require filtered_search/filtered_search_tokenizer
//= require filtered_search/filtered_search_dropdown_manager
require('~/extensions/array');
require('~/filtered_search/filtered_search_tokenizer');
require('~/filtered_search/filtered_search_dropdown_manager');
(() => {
describe('Filtered Search Dropdown Manager', () => {
...
...
spec/javascripts/filtered_search/filtered_search_token_keys_spec.js.es6
浏览文件 @
2ee2daa4
//= require extensions/array
//= require filtered_search/filtered_search_token_keys
require('~/extensions/array');
require('~/filtered_search/filtered_search_token_keys');
(() => {
describe('Filtered Search Token Keys', () => {
...
...
spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js.es6
浏览文件 @
2ee2daa4
//= require extensions/array
//= require filtered_search/filtered_search_token_keys
//= require filtered_search/filtered_search_tokenizer
require('~/extensions/array');
require('~/filtered_search/filtered_search_token_keys');
require('~/filtered_search/filtered_search_tokenizer');
(() => {
describe('Filtered Search Tokenizer', () => {
...
...
spec/javascripts/lib/utils/text_utility_spec.js.es6
浏览文件 @
2ee2daa4
//= require lib/utils/text_utility
require('~/lib/utils/text_utility');
(() => {
describe('text_utility', () => {
...
...
spec/javascripts/vue_pagination/pagination_spec.js.es6
浏览文件 @
2ee2daa4
//= require vue
//= require lib/utils/common_utils
//= require vue_pagination/index
/* global fixture, gl */
require('~/lib/utils/common_utils');
require('~/vue_pagination/index');
describe('Pagination component', () => {
let component;
...
...
@@ -17,7 +15,7 @@ describe('Pagination component', () => {
};
it('should render and start at page 1', () => {
fixture.set
('<div class="test-pagination-container"></div>');
setFixtures
('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'),
...
...
@@ -40,7 +38,7 @@ describe('Pagination component', () => {
});
it('should go to the previous page', () => {
fixture.set
('<div class="test-pagination-container"></div>');
setFixtures
('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'),
...
...
@@ -61,7 +59,7 @@ describe('Pagination component', () => {
});
it('should go to the next page', () => {
fixture.set
('<div class="test-pagination-container"></div>');
setFixtures
('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'),
...
...
@@ -82,7 +80,7 @@ describe('Pagination component', () => {
});
it('should go to the last page', () => {
fixture.set
('<div class="test-pagination-container"></div>');
setFixtures
('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'),
...
...
@@ -103,7 +101,7 @@ describe('Pagination component', () => {
});
it('should go to the first page', () => {
fixture.set
('<div class="test-pagination-container"></div>');
setFixtures
('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'),
...
...
@@ -124,7 +122,7 @@ describe('Pagination component', () => {
});
it('should do nothing', () => {
fixture.set
('<div class="test-pagination-container"></div>');
setFixtures
('<div class="test-pagination-container"></div>');
component = new window.gl.VueGlPagination({
el: document.querySelector('.test-pagination-container'),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录