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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
435458d2
Commit
435458d2
authored
Mar 06, 2017
by
Sam Rose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update API on frontend to use v4
Use options object to pass params for project endpoint
parent
b3eda944
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+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
No files found.
app/assets/javascripts/api.js
View file @
435458d2
...
@@ -51,15 +51,15 @@ var Api = {
...
@@ -51,15 +51,15 @@ var Api = {
});
});
},
},
// Return projects list. Filtered by query
// Return projects list. Filtered by query
projects
:
function
(
query
,
o
rder
,
callback
)
{
projects
:
function
(
query
,
o
ptions
,
callback
)
{
var
url
=
Api
.
buildUrl
(
Api
.
projectsPath
);
var
url
=
Api
.
buildUrl
(
Api
.
projectsPath
);
return
$
.
ajax
({
return
$
.
ajax
({
url
:
url
,
url
:
url
,
data
:
{
data
:
$
.
extend
(
{
search
:
query
,
search
:
query
,
order_by
:
order
,
per_page
:
20
,
per_page
:
20
membership
:
true
},
},
options
),
dataType
:
"
json
"
dataType
:
"
json
"
}).
done
(
function
(
projects
)
{
}).
done
(
function
(
projects
)
{
return
callback
(
projects
);
return
callback
(
projects
);
...
...
app/assets/javascripts/project_select.js
View file @
435458d2
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
if
(
this
.
groupId
)
{
if
(
this
.
groupId
)
{
return
Api
.
groupProjects
(
this
.
groupId
,
term
,
projectsCallback
);
return
Api
.
groupProjects
(
this
.
groupId
,
term
,
projectsCallback
);
}
else
{
}
else
{
return
Api
.
projects
(
term
,
orderBy
,
projectsCallback
);
return
Api
.
projects
(
term
,
{
order_by
:
orderBy
}
,
projectsCallback
);
}
}
},
},
url
:
function
(
project
)
{
url
:
function
(
project
)
{
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
if
(
_this
.
groupId
)
{
if
(
_this
.
groupId
)
{
return
Api
.
groupProjects
(
_this
.
groupId
,
query
.
term
,
projectsCallback
);
return
Api
.
groupProjects
(
_this
.
groupId
,
query
.
term
,
projectsCallback
);
}
else
{
}
else
{
return
Api
.
projects
(
query
.
term
,
_this
.
orderBy
,
projectsCallback
);
return
Api
.
projects
(
query
.
term
,
{
order_by
:
_this
.
orderBy
}
,
projectsCallback
);
}
}
};
};
})(
this
),
})(
this
),
...
...
app/assets/javascripts/search.js
View file @
435458d2
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
fields
:
[
'
name
'
]
fields
:
[
'
name
'
]
},
},
data
:
function
(
term
,
callback
)
{
data
:
function
(
term
,
callback
)
{
return
Api
.
projects
(
term
,
'
id
'
,
function
(
data
)
{
return
Api
.
projects
(
term
,
{
order_by
:
'
id
'
}
,
function
(
data
)
{
data
.
unshift
({
data
.
unshift
({
name_with_namespace
:
'
Any
'
name_with_namespace
:
'
Any
'
});
});
...
...
app/views/help/ui.html.haml
View file @
435458d2
...
@@ -410,7 +410,7 @@
...
@@ -410,7 +410,7 @@
:javascript
:javascript
$
(
'
#js-project-dropdown
'
).
glDropdown
({
$
(
'
#js-project-dropdown
'
).
glDropdown
({
data
:
function
(
term
,
callback
)
{
data
:
function
(
term
,
callback
)
{
Api
.
projects
(
term
,
"
last_activity_at
"
,
function
(
data
)
{
Api
.
projects
(
term
,
{
order_by
:
'
last_activity_at
'
}
,
function
(
data
)
{
callback
(
data
);
callback
(
data
);
});
});
},
},
...
...
lib/gitlab/gon_helper.rb
View file @
435458d2
module
Gitlab
module
Gitlab
module
GonHelper
module
GonHelper
def
add_gon_variables
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
.
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
.
max_file_size
=
current_application_settings
.
max_attachment_size
gon
.
asset_host
=
ActionController
::
Base
.
asset_host
gon
.
asset_host
=
ActionController
::
Base
.
asset_host
...
...
spec/javascripts/project_title_spec.js
View file @
435458d2
...
@@ -26,7 +26,7 @@ require('~/project');
...
@@ -26,7 +26,7 @@ require('~/project');
var
fakeAjaxResponse
=
function
fakeAjaxResponse
(
req
)
{
var
fakeAjaxResponse
=
function
fakeAjaxResponse
(
req
)
{
var
d
;
var
d
;
expect
(
req
.
url
).
toBe
(
'
/api/v3/projects.json?simple=true
'
);
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
=
$
.
Deferred
();
d
.
resolve
(
this
.
projects_data
);
d
.
resolve
(
this
.
projects_data
);
return
d
.
promise
();
return
d
.
promise
();
...
...
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