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
2dabc9c3
Commit
2dabc9c3
authored
Aug 14, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE-specific lines from IssuablesHelper
parent
ed76ae68
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+0
-2
ee/app/helpers/ee/issuables_helper.rb
ee/app/helpers/ee/issuables_helper.rb
+13
-0
No files found.
app/helpers/issuables_helper.rb
View file @
2dabc9c3
...
@@ -254,7 +254,6 @@ module IssuablesHelper
...
@@ -254,7 +254,6 @@ module IssuablesHelper
updateEndpoint:
"
#{
issuable_path
(
issuable
)
}
.json"
,
updateEndpoint:
"
#{
issuable_path
(
issuable
)
}
.json"
,
canUpdate:
can?
(
current_user
,
:"update_
#{
issuable
.
to_ability_name
}
"
,
issuable
),
canUpdate:
can?
(
current_user
,
:"update_
#{
issuable
.
to_ability_name
}
"
,
issuable
),
canDestroy:
can?
(
current_user
,
:"destroy_
#{
issuable
.
to_ability_name
}
"
,
issuable
),
canDestroy:
can?
(
current_user
,
:"destroy_
#{
issuable
.
to_ability_name
}
"
,
issuable
),
canAdmin:
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
issuable
),
issuableRef:
issuable
.
to_reference
,
issuableRef:
issuable
.
to_reference
,
markdownPreviewPath:
preview_markdown_path
(
parent
),
markdownPreviewPath:
preview_markdown_path
(
parent
),
markdownDocsPath:
help_page_path
(
'user/markdown'
),
markdownDocsPath:
help_page_path
(
'user/markdown'
),
...
@@ -269,7 +268,6 @@ module IssuablesHelper
...
@@ -269,7 +268,6 @@ module IssuablesHelper
if
parent
.
is_a?
(
Group
)
if
parent
.
is_a?
(
Group
)
data
[
:groupPath
]
=
parent
.
path
data
[
:groupPath
]
=
parent
.
path
data
[
:issueLinksEndpoint
]
=
group_epic_issues_path
(
parent
,
issuable
)
else
else
data
.
merge!
(
projectPath:
ref_project
.
path
,
projectNamespace:
ref_project
.
namespace
.
full_path
)
data
.
merge!
(
projectPath:
ref_project
.
path
,
projectNamespace:
ref_project
.
namespace
.
full_path
)
end
end
...
...
ee/app/helpers/ee/issuables_helper.rb
View file @
2dabc9c3
...
@@ -9,5 +9,18 @@ module EE
...
@@ -9,5 +9,18 @@ module EE
weightNoneValue:
::
Issue
::
WEIGHT_NONE
weightNoneValue:
::
Issue
::
WEIGHT_NONE
)
)
end
end
override
:issuable_initial_data
def
issuable_initial_data
(
issuable
)
data
=
super
.
merge
(
canAdmin:
can?
(
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
issuable
)
)
if
parent
.
is_a?
(
Group
)
data
[
:issueLinksEndpoint
]
=
group_epic_issues_path
(
parent
,
issuable
)
end
data
end
end
end
end
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