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
2f462ba5
Commit
2f462ba5
authored
Aug 13, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts
parent
5f33661c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
9 deletions
+0
-9
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+0
-5
changelogs/unreleased/50126-blocked-user-card.yml
changelogs/unreleased/50126-blocked-user-card.yml
+0
-4
No files found.
app/views/projects/blob/_editor.html.haml
View file @
2f462ba5
...
...
@@ -6,14 +6,9 @@
=
sprite_icon
(
'fork'
,
size:
12
)
=
ref
-
if
current_action?
(
:edit
)
||
current_action?
(
:update
)
<
<<<<<<
HEAD
=
text_field_tag
'file_path'
,
(
params
[
:file_path
]
||
@path
),
class:
'form-control new-file-path js-file-path-name-input'
==
=====
%span
.editor-file-name
=
text_field_tag
'file_path'
,
(
params
[
:file_path
]
||
@path
),
class:
'form-control new-file-path js-file-path-name-input'
>
>>>>>> upstream/master
-
if
current_action?
(
:new
)
||
current_action?
(
:create
)
%span
.editor-file-name
...
...
changelogs/unreleased/50126-blocked-user-card.yml
View file @
2f462ba5
---
title
:
Fix blocked user card style
<<<<<<< HEAD
merge_request
:
6849
=======
merge_request
:
21095
>
>>>>>>
upstream/master
author
:
type
:
fixed
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