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
d4d86f93
Commit
d4d86f93
authored
Jun 11, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE-specific code from logs tree dropdown
parent
d161f031
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
app/views/projects/refs/logs_tree.js.haml
app/views/projects/refs/logs_tree.js.haml
+1
-8
ee/app/views/projects/refs/_logs_tree_lock_label.js.haml
ee/app/views/projects/refs/_logs_tree_lock_label.js.haml
+9
-0
No files found.
app/views/projects/refs/logs_tree.js.haml
View file @
d4d86f93
-
@logs
.
each
do
|
content_data
|
-
file_name
=
content_data
[
:file_name
]
-
commit
=
content_data
[
:commit
]
-
lock_label
=
content_data
[
:lock_label
]
-
next
unless
commit
:plain
...
...
@@ -9,13 +8,7 @@
row.find("td.tree-time-ago").html('
#{
escape_javascript
time_ago_with_tooltip
(
commit
.
committed_date
)
}
');
row.find("td.tree-commit").html('
#{
escape_javascript
render
(
"projects/tree/tree_commit_column"
,
commit:
commit
)
}
');
-
if
lock_label
:plain
var label = $("<span>")
.attr('title', '
#{
escape_javascript
lock_label
.
html_safe
}
')
.attr('data-toggle', 'tooltip')
.addClass('fa fa-lock prepend-left-5');
row.find('td.tree-item-file-name').append(label);
=
render_if_exists
'projects/refs/logs_tree_lock_label'
,
lock_label:
content_data
[
:lock_label
]
-
if
@more_log_url
:plain
...
...
ee/app/views/projects/refs/_logs_tree_lock_label.js.haml
0 → 100644
View file @
d4d86f93
-
lock_label
=
local_assigns
.
fetch
(
:lock_label
)
-
return
unless
lock_label
:plain
var label = $("<span>")
.attr('title', '
#{
escape_javascript
lock_label
.
html_safe
}
')
.attr('data-toggle', 'tooltip')
.addClass('fa fa-lock prepend-left-5');
row.find('td.tree-item-file-name').append(label);
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