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
ea2cda27
Commit
ea2cda27
authored
Jun 11, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE-specific code from blob header
parent
be1825fa
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
app/views/projects/blob/_header.html.haml
app/views/projects/blob/_header.html.haml
+2
-10
ee/app/views/projects/blob/_header_file_locks.html.haml
ee/app/views/projects/blob/_header_file_locks.html.haml
+9
-0
ee/app/views/projects/blob/_header_file_locks_link.html.haml
ee/app/views/projects/blob/_header_file_locks_link.html.haml
+1
-0
No files found.
app/views/projects/blob/_header.html.haml
View file @
ea2cda27
...
...
@@ -11,8 +11,7 @@
=
view_on_environment_button
(
@commit
.
sha
,
@path
,
@environment
)
if
@environment
.btn-group
{
role:
"group"
}
<
=
lock_file_link
(
html_options:
{
class:
'btn btn-sm path-lock'
})
=
render_if_exists
'projects/blob/header_file_locks_link'
=
edit_blob_button
=
ide_edit_button
-
if
current_user
...
...
@@ -20,11 +19,4 @@
=
delete_blob_link
=
render
'projects/fork_suggestion'
-
if
@project
.
feature_available?
(
:file_locks
)
-# haml-lint:disable InlineJavaScript
%script
#js-file-lock
{
type:
"application/json"
}
-
data
=
{}
-
data
[
:path
]
=
@path
-
data
[
:toggle_path
]
=
toggle_project_path_locks_path
(
@project
)
=
data
.
to_json
.
html_safe
=
render_if_exists
'projects/blob/header_file_locks'
,
project:
@project
,
path:
@path
ee/app/views/projects/blob/_header_file_locks.html.haml
0 → 100644
View file @
ea2cda27
-
project
=
local_assigns
.
fetch
(
:project
)
-
path
=
local_assigns
.
fetch
(
:path
)
-
return
unless
project
.
feature_available?
(
:file_locks
)
-# haml-lint:disable InlineJavaScript
%script
#js-file-lock
{
type:
"application/json"
}
-
data
=
{
path:
path
,
toggle_path:
toggle_project_path_locks_path
(
project
)
}
=
data
.
to_json
.
html_safe
ee/app/views/projects/blob/_header_file_locks_link.html.haml
0 → 100644
View file @
ea2cda27
=
lock_file_link
(
html_options:
{
class:
'btn btn-sm path-lock'
})
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