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
dfe6f894
Commit
dfe6f894
authored
Jan 21, 2021
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert path-lock unlock button to pajamas
parent
50b64375
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
ee/app/views/projects/path_locks/_path_lock.html.haml
ee/app/views/projects/path_locks/_path_lock.html.haml
+1
-1
ee/changelogs/unreleased/231170-path-lock-button.yml
ee/changelogs/unreleased/231170-path-lock-button.yml
+5
-0
No files found.
ee/app/views/projects/path_locks/_path_lock.html.haml
View file @
dfe6f894
...
...
@@ -6,7 +6,7 @@
.controls
-
if
can_unlock?
(
path_lock
)
=
link_to
project_path_lock_path
(
@project
,
path_lock
),
class:
'btn'
,
title:
_
(
"Unlock"
),
method: :delete
,
data:
{
confirm:
_
(
"Are you sure you want to unlock %{path_lock_path}?"
)
%
{
path_lock_path:
path_lock
.
path
},
container:
'body'
,
qa_selector:
'unlock_button'
},
remote:
true
do
=
link_to
project_path_lock_path
(
@project
,
path_lock
),
class:
'btn
gl-button
'
,
title:
_
(
"Unlock"
),
method: :delete
,
data:
{
confirm:
_
(
"Are you sure you want to unlock %{path_lock_path}?"
)
%
{
path_lock_path:
path_lock
.
path
},
container:
'body'
,
qa_selector:
'unlock_button'
},
remote:
true
do
=
_
(
'Unlock'
)
=
_
(
"locked by %{path_lock_user_name} %{created_at}"
).
html_safe
%
{
path_lock_user_name:
path_lock
.
user
.
name
,
created_at:
time_ago_with_tooltip
(
path_lock
.
created_at
)
}
ee/changelogs/unreleased/231170-path-lock-button.yml
0 → 100644
View file @
dfe6f894
---
title
:
Convert path-lock unlock button to pajamas
merge_request
:
52276
author
:
type
:
other
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