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
c95477a9
Commit
c95477a9
authored
Apr 10, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts in issue model
parent
0bf45519
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
app/models/issue.rb
app/models/issue.rb
+0
-3
No files found.
app/models/issue.rb
View file @
c95477a9
...
@@ -39,12 +39,9 @@ class Issue < ActiveRecord::Base
...
@@ -39,12 +39,9 @@ class Issue < ActiveRecord::Base
has_many
:issue_assignees
has_many
:issue_assignees
has_many
:assignees
,
->
{
auto_include
(
false
)
},
class_name:
"User"
,
through: :issue_assignees
has_many
:assignees
,
->
{
auto_include
(
false
)
},
class_name:
"User"
,
through: :issue_assignees
<<<<<<<
HEAD
has_one
:epic_issue
has_one
:epic_issue
has_one
:epic
,
through: :epic_issue
has_one
:epic
,
through: :epic_issue
=======
>>>>>>>
upstream
/
master
validates
:project
,
presence:
true
validates
:project
,
presence:
true
...
...
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