Commit ac5fdda4 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Resolve conflicts in index.html.haml

parent ed0753a9
- 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment