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
322ce8e2
Commit
322ce8e2
authored
Jul 02, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved conflict in boards sidebar between CE && EE
parent
c3505eb4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
app/views/shared/boards/components/_sidebar.html.haml
app/views/shared/boards/components/_sidebar.html.haml
+2
-3
No files found.
app/views/shared/boards/components/_sidebar.html.haml
View file @
322ce8e2
...
...
@@ -7,9 +7,8 @@
%strong
{{ issue.title }}
%br
/
%span<
-
if
@group
{{
issue
.
project
&&
issue
.
project
.
path
}}
%span
=
render_if_exists
"shared/boards/components/sidebar/issue_project_path"
=
precede
"#"
do
{{ issue.iid }}
%a
.gutter-toggle.float-right
{
role:
"button"
,
...
...
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