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
ff3874e0
Commit
ff3874e0
authored
Jul 28, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Working File Locks
parent
696e9252
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+1
-1
app/views/projects/tree/_tree_content.html.haml
app/views/projects/tree/_tree_content.html.haml
+1
-5
No files found.
app/assets/javascripts/dispatcher.js
View file @
ff3874e0
...
...
@@ -366,7 +366,7 @@ import AuditLogs from './audit_logs';
shortcut_handler
=
new
ShortcutsNavigation
();
new
TreeView
();
new
BlobViewer
();
if
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
pathLocksAvailable
===
'
true
'
)
{
PathLocks
.
init
(
document
.
querySelector
(
'
.js-tree-content
'
).
dataset
.
pathLocksToggle
,
...
...
app/views/projects/tree/_tree_content.html.haml
View file @
ff3874e0
.tree-content-holder.js-tree-content
{
'data-logs-path'
:
@logs_path
,
'data-path
locks-available'
:
(
'true'
if
@project
.
feature_available?
(
:file_locks
)
),
'data-path-locks-toggle'
:
toggle_project_path_locks_path
(
@project
),
'data-path-locks-path'
:
@path
}
.tree-content-holder.js-tree-content
{
'data-logs-path'
:
@logs_path
,
'data-path
-locks-available'
:
(
@project
.
feature_available?
(
:file_locks
)
?
'true'
:
'false'
),
'data-path-locks-toggle'
:
toggle_project_path_locks_path
(
@project
),
'data-path-locks-path'
:
@path
}
.table-holder
%table
.table
#tree-slider
{
class:
"table_#{@hex_path} tree-table"
}
%thead
...
...
@@ -22,7 +22,3 @@
-
if
can_edit_tree?
=
render
'projects/blob/upload'
,
title:
_
(
'Upload New File'
),
placeholder:
_
(
'Upload New File'
),
button_title:
_
(
'Upload file'
),
form_path:
project_create_blob_path
(
@project
,
@id
),
method: :post
=
render
'projects/blob/new_dir'
-
if
@project
.
feature_available?
(
:file_locks
)
:javascript
alert
(
'
LALAL 1
'
)
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