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
84d866ba
Commit
84d866ba
authored
Oct 10, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename board_filter_label references to board_label
parent
b725c908
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/models/board_label.rb
app/models/board_label.rb
+1
-1
ee/app/models/ee/board.rb
ee/app/models/ee/board.rb
+2
-2
spec/factories/board_filter_labels.rb
spec/factories/board_filter_labels.rb
+1
-1
spec/models/board_spec.rb
spec/models/board_spec.rb
+2
-2
No files found.
app/models/board_
filter_
label.rb
→
app/models/board_label.rb
View file @
84d866ba
class
Board
Filter
Label
<
ActiveRecord
::
Base
class
BoardLabel
<
ActiveRecord
::
Base
belongs_to
:board
belongs_to
:label
...
...
ee/app/models/ee/board.rb
View file @
84d866ba
...
...
@@ -7,8 +7,8 @@ module EE
belongs_to
:milestone
belongs_to
:assignee
,
class_name:
'User'
has_many
:board_
filter_
labels
has_many
:labels
,
through: :board_
filter_
labels
has_many
:board_labels
has_many
:labels
,
through: :board_labels
validates
:name
,
presence:
true
validates
:group
,
presence:
true
,
unless: :project
...
...
spec/factories/board_filter_labels.rb
View file @
84d866ba
FactoryGirl
.
define
do
factory
:board_
filter_
label
do
factory
:board_label
do
association
:board
association
:label
end
...
...
spec/models/board_spec.rb
View file @
84d866ba
...
...
@@ -5,8 +5,8 @@ describe Board do
it
{
is_expected
.
to
belong_to
(
:project
)
}
it
{
is_expected
.
to
belong_to
(
:milestone
)
}
it
{
is_expected
.
to
belong_to
(
:assignee
).
class_name
(
'User'
)
}
it
{
is_expected
.
to
have_many
(
:board_
filter_
labels
)
}
it
{
is_expected
.
to
have_many
(
:labels
).
through
(
:board_
filter_
labels
)
}
it
{
is_expected
.
to
have_many
(
:board_labels
)
}
it
{
is_expected
.
to
have_many
(
:labels
).
through
(
:board_labels
)
}
it
{
is_expected
.
to
have_many
(
:lists
).
order
(
list_type: :asc
,
position: :asc
).
dependent
(
:delete_all
)
}
end
...
...
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