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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b67426c1
Commit
b67426c1
authored
Mar 02, 2017
by
Phil Hughes
Committed by
Douglas Barbosa Alexandre
Mar 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed default class not being removed
Fixed dropdown options not updating
parent
3f79d7ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
14 deletions
+12
-14
app/assets/javascripts/boards/components/boards_selector.js
app/assets/javascripts/boards/components/boards_selector.js
+4
-1
db/schema.rb
db/schema.rb
+8
-6
spec/features/boards/board_with_milestone_spec.rb
spec/features/boards/board_with_milestone_spec.rb
+0
-7
No files found.
app/assets/javascripts/boards/components/boards_selector.js
View file @
b67426c1
...
@@ -100,6 +100,8 @@ require('./board_new_form');
...
@@ -100,6 +100,8 @@ require('./board_new_form');
const
$milestoneDropdown
=
$
(
'
.dropdown-menu-milestone
'
);
const
$milestoneDropdown
=
$
(
'
.dropdown-menu-milestone
'
);
const
hideElements
=
this
.
board
.
milestone
===
undefined
||
this
.
board
.
milestone_id
===
null
;
const
hideElements
=
this
.
board
.
milestone
===
undefined
||
this
.
board
.
milestone_id
===
null
;
$
(
'
#milestone_title
'
).
val
(
this
.
board
.
milestone
?
this
.
board
.
milestone
.
title
:
''
);
if
(
glDropdown
.
fullData
)
{
if
(
glDropdown
.
fullData
)
{
glDropdown
.
parseData
(
glDropdown
.
fullData
);
glDropdown
.
parseData
(
glDropdown
.
fullData
);
}
}
...
@@ -112,7 +114,8 @@ require('./board_new_form');
...
@@ -112,7 +114,8 @@ require('./board_new_form');
.
toggle
(
hideElements
);
.
toggle
(
hideElements
);
$
(
'
.js-milestone-select .dropdown-toggle-text
'
)
$
(
'
.js-milestone-select .dropdown-toggle-text
'
)
.
text
(
hideElements
?
'
Milestone
'
:
this
.
board
.
milestone
.
title
);
.
text
(
hideElements
?
'
Milestone
'
:
this
.
board
.
milestone
.
title
)
.
toggleClass
(
'
is-default
'
,
hideElements
);
},
},
},
},
created
()
{
created
()
{
...
...
db/schema.rb
View file @
b67426c1
...
@@ -663,9 +663,9 @@ ActiveRecord::Schema.define(version: 20170224075132) do
...
@@ -663,9 +663,9 @@ ActiveRecord::Schema.define(version: 20170224075132) do
end
end
add_index
"labels"
,
[
"group_id"
,
"project_id"
,
"title"
],
name:
"index_labels_on_group_id_and_project_id_and_title"
,
unique:
true
,
using: :btree
add_index
"labels"
,
[
"group_id"
,
"project_id"
,
"title"
],
name:
"index_labels_on_group_id_and_project_id_and_title"
,
unique:
true
,
using: :btree
add_index
"labels"
,
[
"type"
,
"project_id"
],
name:
"index_labels_on_type_and_project_id"
,
using: :btree
add_index
"labels"
,
[
"project_id"
],
name:
"index_labels_on_project_id"
,
using: :btree
add_index
"labels"
,
[
"project_id"
],
name:
"index_labels_on_project_id"
,
using: :btree
add_index
"labels"
,
[
"title"
],
name:
"index_labels_on_title"
,
using: :btree
add_index
"labels"
,
[
"title"
],
name:
"index_labels_on_title"
,
using: :btree
add_index
"labels"
,
[
"type"
,
"project_id"
],
name:
"index_labels_on_type_and_project_id"
,
using: :btree
create_table
"ldap_group_links"
,
force: :cascade
do
|
t
|
create_table
"ldap_group_links"
,
force: :cascade
do
|
t
|
t
.
string
"cn"
,
null:
false
t
.
string
"cn"
,
null:
false
...
@@ -866,14 +866,14 @@ ActiveRecord::Schema.define(version: 20170224075132) do
...
@@ -866,14 +866,14 @@ ActiveRecord::Schema.define(version: 20170224075132) do
t
.
boolean
"share_with_group_lock"
,
default:
false
t
.
boolean
"share_with_group_lock"
,
default:
false
t
.
integer
"visibility_level"
,
default:
20
,
null:
false
t
.
integer
"visibility_level"
,
default:
20
,
null:
false
t
.
boolean
"request_access_enabled"
,
default:
false
,
null:
false
t
.
boolean
"request_access_enabled"
,
default:
false
,
null:
false
t
.
datetime
"deleted_at"
t
.
string
"ldap_sync_status"
,
default:
"ready"
,
null:
false
t
.
string
"ldap_sync_status"
,
default:
"ready"
,
null:
false
t
.
string
"ldap_sync_error"
t
.
string
"ldap_sync_error"
t
.
datetime
"ldap_sync_last_update_at"
t
.
datetime
"ldap_sync_last_update_at"
t
.
datetime
"ldap_sync_last_successful_update_at"
t
.
datetime
"ldap_sync_last_successful_update_at"
t
.
datetime
"ldap_sync_last_sync_at"
t
.
datetime
"ldap_sync_last_sync_at"
t
.
datetime
"deleted_at"
t
.
text
"description_html"
t
.
boolean
"lfs_enabled"
t
.
boolean
"lfs_enabled"
t
.
text
"description_html"
t
.
integer
"parent_id"
t
.
integer
"parent_id"
t
.
integer
"shared_runners_minutes_limit"
t
.
integer
"shared_runners_minutes_limit"
t
.
integer
"repository_size_limit"
,
limit:
8
t
.
integer
"repository_size_limit"
,
limit:
8
...
@@ -1084,6 +1084,7 @@ ActiveRecord::Schema.define(version: 20170224075132) do
...
@@ -1084,6 +1084,7 @@ ActiveRecord::Schema.define(version: 20170224075132) do
t
.
datetime
"created_at"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
datetime
"updated_at"
t
.
integer
"creator_id"
t
.
integer
"creator_id"
t
.
boolean
"wall_enabled"
,
default:
true
,
null:
false
t
.
integer
"namespace_id"
t
.
integer
"namespace_id"
t
.
datetime
"last_activity_at"
t
.
datetime
"last_activity_at"
t
.
string
"import_url"
t
.
string
"import_url"
...
@@ -1120,9 +1121,9 @@ ActiveRecord::Schema.define(version: 20170224075132) do
...
@@ -1120,9 +1121,9 @@ ActiveRecord::Schema.define(version: 20170224075132) do
t
.
boolean
"only_allow_merge_if_pipeline_succeeds"
,
default:
false
,
null:
false
t
.
boolean
"only_allow_merge_if_pipeline_succeeds"
,
default:
false
,
null:
false
t
.
boolean
"has_external_issue_tracker"
t
.
boolean
"has_external_issue_tracker"
t
.
string
"repository_storage"
,
default:
"default"
,
null:
false
t
.
string
"repository_storage"
,
default:
"default"
,
null:
false
t
.
boolean
"repository_read_only"
t
.
boolean
"request_access_enabled"
,
default:
false
,
null:
false
t
.
boolean
"request_access_enabled"
,
default:
false
,
null:
false
t
.
boolean
"has_external_wiki"
t
.
boolean
"has_external_wiki"
t
.
boolean
"repository_read_only"
t
.
boolean
"lfs_enabled"
t
.
boolean
"lfs_enabled"
t
.
text
"description_html"
t
.
text
"description_html"
t
.
boolean
"only_allow_merge_if_all_discussions_are_resolved"
t
.
boolean
"only_allow_merge_if_all_discussions_are_resolved"
...
@@ -1474,12 +1475,13 @@ ActiveRecord::Schema.define(version: 20170224075132) do
...
@@ -1474,12 +1475,13 @@ ActiveRecord::Schema.define(version: 20170224075132) do
t
.
datetime
"otp_grace_period_started_at"
t
.
datetime
"otp_grace_period_started_at"
t
.
boolean
"ldap_email"
,
default:
false
,
null:
false
t
.
boolean
"ldap_email"
,
default:
false
,
null:
false
t
.
boolean
"external"
,
default:
false
t
.
boolean
"external"
,
default:
false
t
.
string
"incoming_email_token"
t
.
string
"organization"
t
.
string
"organization"
t
.
string
"incoming_email_token"
t
.
boolean
"authorized_projects_populated"
t
.
boolean
"authorized_projects_populated"
t
.
boolean
"auditor"
,
default:
false
,
null:
false
t
.
boolean
"auditor"
,
default:
false
,
null:
false
t
.
boolean
"notified_of_own_activity"
,
default:
false
,
null:
false
t
.
boolean
"notified_of_own_activity"
,
default:
false
,
null:
false
t
.
boolean
"ghost"
t
.
boolean
"ghost"
t
.
integer
"theme_id"
,
default:
1
,
null:
false
end
end
add_index
"users"
,
[
"admin"
],
name:
"index_users_on_admin"
,
using: :btree
add_index
"users"
,
[
"admin"
],
name:
"index_users_on_admin"
,
using: :btree
...
@@ -1522,8 +1524,8 @@ ActiveRecord::Schema.define(version: 20170224075132) do
...
@@ -1522,8 +1524,8 @@ ActiveRecord::Schema.define(version: 20170224075132) do
t
.
boolean
"note_events"
,
default:
false
,
null:
false
t
.
boolean
"note_events"
,
default:
false
,
null:
false
t
.
boolean
"enable_ssl_verification"
,
default:
true
t
.
boolean
"enable_ssl_verification"
,
default:
true
t
.
boolean
"build_events"
,
default:
false
,
null:
false
t
.
boolean
"build_events"
,
default:
false
,
null:
false
t
.
boolean
"wiki_page_events"
,
default:
false
,
null:
false
t
.
string
"token"
t
.
string
"token"
t
.
boolean
"wiki_page_events"
,
default:
false
,
null:
false
t
.
boolean
"pipeline_events"
,
default:
false
,
null:
false
t
.
boolean
"pipeline_events"
,
default:
false
,
null:
false
t
.
boolean
"confidential_issues_events"
,
default:
false
,
null:
false
t
.
boolean
"confidential_issues_events"
,
default:
false
,
null:
false
end
end
...
...
spec/features/boards/board_with_milestone_spec.rb
View file @
b67426c1
...
@@ -59,13 +59,6 @@ describe 'Multiple Issue Boards', :feature, :js do
...
@@ -59,13 +59,6 @@ describe 'Multiple Issue Boards', :feature, :js do
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
2
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
2
)
end
end
it
'sets board to any milestone'
do
update_board_milestone
(
'Any Milestone'
)
expect
(
find
(
'.js-milestone-select'
)).
not_to
have_content
(
milestone
.
title
)
expect
(
all
(
'.board'
)[
1
]).
to
have_selector
(
'.card'
,
count:
2
)
end
it
'sets board to upcoming milestone'
do
it
'sets board to upcoming milestone'
do
update_board_milestone
(
'Upcoming'
)
update_board_milestone
(
'Upcoming'
)
...
...
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