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
ac5fdda4
Commit
ac5fdda4
authored
Sep 06, 2018
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in index.html.haml
parent
ed0753a9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+0
-4
No files found.
app/views/groups/labels/index.html.haml
View file @
ac5fdda4
-
page_title
'Labels'
-
can_admin_label
=
can?
(
current_user
,
:admin_label
,
@group
)
<
<<<<<<
HEAD
-
issuables
=
[
'issues'
,
'merge requests'
]
+
(
@group
&
.
feature_available?
(
:epics
)
?
[
'epics'
]
:
[])
==
=====
-
issuables
=
[
'issues'
,
'merge requests'
]
>
>>>>>> upstream/master
-
search
=
params
[
:search
]
-
if
can_admin_label
...
...
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