Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
435458d2
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 搜索 >>
提交
435458d2
编写于
3月 06, 2017
作者:
S
Sam Rose
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update API on frontend to use v4
Use options object to pass params for project endpoint
上级
b3eda944
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
11 addition
and
11 deletion
+11
-11
app/assets/javascripts/api.js
app/assets/javascripts/api.js
+5
-5
app/assets/javascripts/project_select.js
app/assets/javascripts/project_select.js
+2
-2
app/assets/javascripts/search.js
app/assets/javascripts/search.js
+1
-1
app/views/help/ui.html.haml
app/views/help/ui.html.haml
+1
-1
lib/gitlab/gon_helper.rb
lib/gitlab/gon_helper.rb
+1
-1
spec/javascripts/project_title_spec.js
spec/javascripts/project_title_spec.js
+1
-1
未找到文件。
app/assets/javascripts/api.js
浏览文件 @
435458d2
...
...
@@ -51,15 +51,15 @@ var Api = {
});
},
// Return projects list. Filtered by query
projects
:
function
(
query
,
o
rder
,
callback
)
{
projects
:
function
(
query
,
o
ptions
,
callback
)
{
var
url
=
Api
.
buildUrl
(
Api
.
projectsPath
);
return
$
.
ajax
({
url
:
url
,
data
:
{
data
:
$
.
extend
(
{
search
:
query
,
order_by
:
order
,
per_page
:
20
},
per_page
:
20
,
membership
:
true
},
options
),
dataType
:
"
json
"
}).
done
(
function
(
projects
)
{
return
callback
(
projects
);
...
...
app/assets/javascripts/project_select.js
浏览文件 @
435458d2
...
...
@@ -35,7 +35,7 @@
if
(
this
.
groupId
)
{
return
Api
.
groupProjects
(
this
.
groupId
,
term
,
projectsCallback
);
}
else
{
return
Api
.
projects
(
term
,
orderBy
,
projectsCallback
);
return
Api
.
projects
(
term
,
{
order_by
:
orderBy
}
,
projectsCallback
);
}
},
url
:
function
(
project
)
{
...
...
@@ -84,7 +84,7 @@
if
(
_this
.
groupId
)
{
return
Api
.
groupProjects
(
_this
.
groupId
,
query
.
term
,
projectsCallback
);
}
else
{
return
Api
.
projects
(
query
.
term
,
_this
.
orderBy
,
projectsCallback
);
return
Api
.
projects
(
query
.
term
,
{
order_by
:
_this
.
orderBy
}
,
projectsCallback
);
}
};
})(
this
),
...
...
app/assets/javascripts/search.js
浏览文件 @
435458d2
...
...
@@ -47,7 +47,7 @@
fields
:
[
'
name
'
]
},
data
:
function
(
term
,
callback
)
{
return
Api
.
projects
(
term
,
'
id
'
,
function
(
data
)
{
return
Api
.
projects
(
term
,
{
order_by
:
'
id
'
}
,
function
(
data
)
{
data
.
unshift
({
name_with_namespace
:
'
Any
'
});
...
...
app/views/help/ui.html.haml
浏览文件 @
435458d2
...
...
@@ -410,7 +410,7 @@
:javascript
$
(
'
#js-project-dropdown
'
).
glDropdown
({
data
:
function
(
term
,
callback
)
{
Api
.
projects
(
term
,
"
last_activity_at
"
,
function
(
data
)
{
Api
.
projects
(
term
,
{
order_by
:
'
last_activity_at
'
}
,
function
(
data
)
{
callback
(
data
);
});
},
...
...
lib/gitlab/gon_helper.rb
浏览文件 @
435458d2
module
Gitlab
module
GonHelper
def
add_gon_variables
gon
.
api_version
=
'v
3'
# v4 Is not officially released yet, therefore can't be considered as "frozen"
gon
.
api_version
=
'v
4'
gon
.
default_avatar_url
=
URI
.
join
(
Gitlab
.
config
.
gitlab
.
url
,
ActionController
::
Base
.
helpers
.
image_path
(
'no_avatar.png'
)).
to_s
gon
.
max_file_size
=
current_application_settings
.
max_attachment_size
gon
.
asset_host
=
ActionController
::
Base
.
asset_host
...
...
spec/javascripts/project_title_spec.js
浏览文件 @
435458d2
...
...
@@ -26,7 +26,7 @@ require('~/project');
var
fakeAjaxResponse
=
function
fakeAjaxResponse
(
req
)
{
var
d
;
expect
(
req
.
url
).
toBe
(
'
/api/v3/projects.json?simple=true
'
);
expect
(
req
.
data
).
toEqual
({
search
:
''
,
order_by
:
'
last_activity_at
'
,
per_page
:
20
});
expect
(
req
.
data
).
toEqual
({
search
:
''
,
order_by
:
'
last_activity_at
'
,
per_page
:
20
,
membership
:
true
});
d
=
$
.
Deferred
();
d
.
resolve
(
this
.
projects_data
);
return
d
.
promise
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录