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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
515a5aeb
Commit
515a5aeb
authored
Jun 01, 2016
by
Phil Hughes
Committed by
Jacob Schatz
Jun 05, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed JS errors
CHANGELOG item
parent
86df1139
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
17 deletions
+15
-17
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/due_date_select.js.coffee
app/assets/javascripts/due_date_select.js.coffee
+3
-2
app/assets/javascripts/milestone_select.js.coffee
app/assets/javascripts/milestone_select.js.coffee
+2
-2
app/assets/javascripts/users_select.js.coffee
app/assets/javascripts/users_select.js.coffee
+1
-1
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+2
-6
spec/javascripts/graphs/stat_graph_contributors_util_spec.js
spec/javascripts/graphs/stat_graph_contributors_util_spec.js
+6
-6
No files found.
CHANGELOG
View file @
515a5aeb
...
@@ -43,6 +43,7 @@ v 8.8.4 (unreleased)
...
@@ -43,6 +43,7 @@ v 8.8.4 (unreleased)
- Fix issue with arrow keys not working in search autocomplete dropdown
- Fix issue with arrow keys not working in search autocomplete dropdown
- Fix todos page throwing errors when you have a project pending deletion
- Fix todos page throwing errors when you have a project pending deletion
- Reduce number of SQL queries when rendering user references
- Reduce number of SQL queries when rendering user references
- Upgrade to jQuery 2
v 8.8.3
v 8.8.3
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
...
...
app/assets/javascripts/due_date_select.js.coffee
View file @
515a5aeb
...
@@ -21,7 +21,7 @@ class @DueDateSelect
...
@@ -21,7 +21,7 @@ class @DueDateSelect
$dropdown
.
glDropdown
(
$dropdown
.
glDropdown
(
hidden
:
->
hidden
:
->
$selectbox
.
hide
()
$selectbox
.
hide
()
$value
.
removeAttr
(
'style
'
)
$value
.
css
(
'display'
,
'
'
)
)
)
addDueDate
=
(
isDropdown
)
->
addDueDate
=
(
isDropdown
)
->
...
@@ -42,12 +42,13 @@ class @DueDateSelect
...
@@ -42,12 +42,13 @@ class @DueDateSelect
type
:
'PUT'
type
:
'PUT'
url
:
issueUpdateURL
url
:
issueUpdateURL
data
:
data
data
:
data
dataType
:
'json'
beforeSend
:
->
beforeSend
:
->
$loading
.
fadeIn
()
$loading
.
fadeIn
()
if
isDropdown
if
isDropdown
$dropdown
.
trigger
(
'loading.gl.dropdown'
)
$dropdown
.
trigger
(
'loading.gl.dropdown'
)
$selectbox
.
hide
()
$selectbox
.
hide
()
$value
.
removeAttr
(
'style
'
)
$value
.
css
(
'display'
,
'
'
)
$valueContent
.
html
(
mediumDate
)
$valueContent
.
html
(
mediumDate
)
$sidebarValue
.
html
(
mediumDate
)
$sidebarValue
.
html
(
mediumDate
)
...
...
app/assets/javascripts/milestone_select.js.coffee
View file @
515a5aeb
...
@@ -83,7 +83,7 @@ class @MilestoneSelect
...
@@ -83,7 +83,7 @@ class @MilestoneSelect
$selectbox
.
hide
()
$selectbox
.
hide
()
# display:block overrides the hide-collapse rule
# display:block overrides the hide-collapse rule
$value
.
removeAttr
(
'style
'
)
$value
.
css
(
'display'
,
'
'
)
clicked
:
(
selected
)
->
clicked
:
(
selected
)
->
page
=
$
(
'body'
).
data
'page'
page
=
$
(
'body'
).
data
'page'
isIssueIndex
=
page
is
'projects:issues:index'
isIssueIndex
=
page
is
'projects:issues:index'
...
@@ -118,7 +118,7 @@ class @MilestoneSelect
...
@@ -118,7 +118,7 @@ class @MilestoneSelect
$dropdown
.
trigger
(
'loaded.gl.dropdown'
)
$dropdown
.
trigger
(
'loaded.gl.dropdown'
)
$loading
.
fadeOut
()
$loading
.
fadeOut
()
$selectbox
.
hide
()
$selectbox
.
hide
()
$value
.
removeAttr
(
'style
'
)
$value
.
css
(
'display'
,
'
'
)
if
data
.
milestone
?
if
data
.
milestone
?
data
.
milestone
.
namespace
=
_this
.
currentProject
.
namespace
data
.
milestone
.
namespace
=
_this
.
currentProject
.
namespace
data
.
milestone
.
path
=
_this
.
currentProject
.
path
data
.
milestone
.
path
=
_this
.
currentProject
.
path
...
...
app/assets/javascripts/users_select.js.coffee
View file @
515a5aeb
...
@@ -149,7 +149,7 @@ class @UsersSelect
...
@@ -149,7 +149,7 @@ class @UsersSelect
hidden
:
(
e
)
->
hidden
:
(
e
)
->
$selectbox
.
hide
()
$selectbox
.
hide
()
# display:block overrides the hide-collapse rule
# display:block overrides the hide-collapse rule
$value
.
removeAttr
(
'style
'
)
$value
.
css
(
'display'
,
'
'
)
clicked
:
(
user
)
->
clicked
:
(
user
)
->
page
=
$
(
'body'
).
data
'page'
page
=
$
(
'body'
).
data
'page'
...
...
spec/features/issues_spec.rb
View file @
515a5aeb
...
@@ -365,13 +365,9 @@ describe 'Issues', feature: true do
...
@@ -365,13 +365,9 @@ describe 'Issues', feature: true do
page
.
within
(
'.assignee'
)
do
page
.
within
(
'.assignee'
)
do
expect
(
page
).
to
have_content
"
#{
@user
.
name
}
"
expect
(
page
).
to
have_content
"
#{
@user
.
name
}
"
end
find
(
'.block.assignee .edit-link'
).
click
click_link
'Edit'
sleep
2
# wait for ajax stuff to complete
click_link
'Unassigned'
first
(
'.dropdown-menu-user-link'
).
click
sleep
2
page
.
within
(
'.assignee'
)
do
expect
(
page
).
to
have_content
'No assignee'
expect
(
page
).
to
have_content
'No assignee'
end
end
...
...
spec/javascripts/graphs/stat_graph_contributors_util_spec.js
View file @
515a5aeb
...
@@ -9,14 +9,14 @@ describe("ContributorsStatGraphUtil", function () {
...
@@ -9,14 +9,14 @@ describe("ContributorsStatGraphUtil", function () {
{
author_email
:
"
dzaporozhets@email.com
"
,
author_name
:
"
Dmitriy Zaporozhets
"
,
date
:
"
2013-05-08
"
,
additions
:
6
,
deletions
:
1
},
{
author_email
:
"
dzaporozhets@email.com
"
,
author_name
:
"
Dmitriy Zaporozhets
"
,
date
:
"
2013-05-08
"
,
additions
:
6
,
deletions
:
1
},
{
author_email
:
"
dzaporozhets@email.com
"
,
author_name
:
"
Dmitriy Zaporozhets
"
,
date
:
"
2013-05-08
"
,
additions
:
19
,
deletions
:
3
},
{
author_email
:
"
dzaporozhets@email.com
"
,
author_name
:
"
Dmitriy Zaporozhets
"
,
date
:
"
2013-05-08
"
,
additions
:
19
,
deletions
:
3
},
{
author_email
:
"
dzaporozhets@email.com
"
,
author_name
:
"
Dmitriy Zaporozhets
"
,
date
:
"
2013-05-08
"
,
additions
:
29
,
deletions
:
3
}]
{
author_email
:
"
dzaporozhets@email.com
"
,
author_name
:
"
Dmitriy Zaporozhets
"
,
date
:
"
2013-05-08
"
,
additions
:
29
,
deletions
:
3
}]
var
correct_parsed_log
=
{
var
correct_parsed_log
=
{
total
:
[
total
:
[
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
},
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
},
{
date
:
"
2013-05-08
"
,
additions
:
54
,
deletions
:
7
,
commits
:
3
}],
{
date
:
"
2013-05-08
"
,
additions
:
54
,
deletions
:
7
,
commits
:
3
}],
by_author
:
by_author
:
[
[
{
{
author_name
:
"
Karlo Soriano
"
,
author_email
:
"
karlo@email.com
"
,
author_name
:
"
Karlo Soriano
"
,
author_email
:
"
karlo@email.com
"
,
"
2013-05-09
"
:
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
}
"
2013-05-09
"
:
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
}
},
},
...
@@ -132,8 +132,8 @@ describe("ContributorsStatGraphUtil", function () {
...
@@ -132,8 +132,8 @@ describe("ContributorsStatGraphUtil", function () {
total
:
[{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
},
total
:
[{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
},
{
date
:
"
2013-05-08
"
,
additions
:
54
,
deletions
:
7
,
commits
:
3
}],
{
date
:
"
2013-05-08
"
,
additions
:
54
,
deletions
:
7
,
commits
:
3
}],
by_author
:[
by_author
:[
{
{
author
:
"
Karlo Soriano
"
,
author
:
"
Karlo Soriano
"
,
"
2013-05-09
"
:
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
}
"
2013-05-09
"
:
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
}
},
},
{
{
...
@@ -161,11 +161,11 @@ describe("ContributorsStatGraphUtil", function () {
...
@@ -161,11 +161,11 @@ describe("ContributorsStatGraphUtil", function () {
it
(
"
returns the log by author sorted by specified field
"
,
function
()
{
it
(
"
returns the log by author sorted by specified field
"
,
function
()
{
var
fake_parsed_log
=
{
var
fake_parsed_log
=
{
total
:
[
total
:
[
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
},
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
},
{
date
:
"
2013-05-08
"
,
additions
:
54
,
deletions
:
7
,
commits
:
3
}
{
date
:
"
2013-05-08
"
,
additions
:
54
,
deletions
:
7
,
commits
:
3
}
],
],
by_author
:
[
by_author
:
[
{
{
author_name
:
"
Karlo Soriano
"
,
author_email
:
"
karlo@email.com
"
,
author_name
:
"
Karlo Soriano
"
,
author_email
:
"
karlo@email.com
"
,
"
2013-05-09
"
:
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
}
"
2013-05-09
"
:
{
date
:
"
2013-05-09
"
,
additions
:
471
,
deletions
:
0
,
commits
:
1
}
},
},
...
...
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