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
38ab0d68
Commit
38ab0d68
authored
Oct 04, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make rubocop happy
parent
045eb28e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
16 deletions
+9
-16
app/controllers/concerns/issuable_actions.rb
app/controllers/concerns/issuable_actions.rb
+1
-1
app/helpers/boards_helper.rb
app/helpers/boards_helper.rb
+1
-1
ee/app/helpers/ee/boards_helper.rb
ee/app/helpers/ee/boards_helper.rb
+1
-1
spec/ee/spec/features/boards/user_configures_board.rb
spec/ee/spec/features/boards/user_configures_board.rb
+1
-11
spec/requests/api/boards_spec.rb
spec/requests/api/boards_spec.rb
+5
-2
No files found.
app/controllers/concerns/issuable_actions.rb
View file @
38ab0d68
...
...
@@ -78,7 +78,7 @@ module IssuableActions
:weight
,
label_ids:
[],
add_label_ids:
[],
remove_label_ids:
[]
,
remove_label_ids:
[]
]
if
resource_name
==
'issue'
...
...
app/helpers/boards_helper.rb
View file @
38ab0d68
...
...
@@ -26,7 +26,7 @@ module BoardsHelper
board
=
@board
||
@boards
.
first
board
.
to_json
(
only:
[
:id
,
:name
,
:milestone_id
]
,
only:
[
:id
,
:name
,
:milestone_id
]
)
end
...
...
ee/app/helpers/ee/boards_helper.rb
View file @
38ab0d68
...
...
@@ -35,7 +35,7 @@ module EE
only:
[
:id
,
:name
,
:milestone_id
,
:assignee_id
,
:weight
,
:label_ids
],
include:
{
milestone:
{
only:
[
:id
,
:title
,
:name
]
},
assignee:
{
only:
[
:id
,
:name
,
:username
],
methods:
[
:avatar_url
]
},
assignee:
{
only:
[
:id
,
:name
,
:username
],
methods:
[
:avatar_url
]
},
labels:
{
only:
[
:title
,
:color
,
:id
]
}
}
)
...
...
spec/ee/spec/features/boards/user_configures_board.rb
View file @
38ab0d68
...
...
@@ -237,9 +237,6 @@ describe 'issue board config', :js do
end
end
# context 'author' do
# end
context
'weight'
do
let!
(
:issue_weight_1
)
{
create
(
:issue
,
project:
project
,
weight:
1
)
}
...
...
@@ -256,13 +253,6 @@ describe 'issue board config', :js do
expect
(
page
).
to
have_selector
(
'.card'
,
count:
4
)
end
# it 'sets board to No weight' do
# TODO
# update_board_weight('No weight')
# expect(page).to have_selector('.card', count: 3)
# end
it
'does not display weight in search hint'
do
update_board_weight
(
1
)
filtered_search
.
click
...
...
@@ -378,6 +368,6 @@ describe 'issue board config', :js do
click_button
'Save'
expect
(
page
).
to
have_selector
(
'.board-list-loading'
)
expect
(
page
).
to_not
have_selector
(
'.board-list-loading'
)
expect
(
page
).
not_to
have_selector
(
'.board-list-loading'
)
end
end
spec/requests/api/boards_spec.rb
View file @
38ab0d68
...
...
@@ -32,8 +32,11 @@ describe API::Boards do
set
(
:board_label
)
{
create
(
:label
,
project:
project
)
}
set
(
:board
)
do
create
(
:board
,
project:
project
,
milestone:
milestone
,
assignee:
user
,
label_ids:
[
board_label
.
id
],
lists:
[
dev_list
,
test_list
])
create
(
:board
,
project:
project
,
milestone:
milestone
,
assignee:
user
,
label_ids:
[
board_label
.
id
],
lists:
[
dev_list
,
test_list
])
end
before
do
...
...
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