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
02dad53f
Commit
02dad53f
authored
7 years ago
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove Turbolinks from lockfile.js, do page refresh instead
parent
d2f70576
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
app/assets/javascripts/path_locks.js
app/assets/javascripts/path_locks.js
+1
-1
spec/features/projects/path_locks_spec.rb
spec/features/projects/path_locks_spec.rb
+20
-0
No files found.
app/assets/javascripts/path_locks.js
View file @
02dad53f
...
...
@@ -12,7 +12,7 @@
return
$
.
post
(
url
,
{
path
:
path
},
function
()
{
return
Turbolinks
.
visit
(
location
.
href
);
location
.
reload
(
);
});
});
};
...
...
This diff is collapsed.
Click to expand it.
spec/features/projects/path_locks_spec.rb
View file @
02dad53f
...
...
@@ -43,6 +43,26 @@ feature 'Path Locks', feature: true, js: true do
end
end
scenario
'Unlocking files'
do
page_tree
=
find
(
'.tree-content-holder'
)
within
page_tree
do
click_link
"VERSION"
end
within
'.file-actions'
do
click_link
"Lock"
expect
(
page
).
to
have_link
(
'Unlock'
)
end
within
'.file-actions'
do
click_link
"Unlock"
expect
(
page
).
to
have_link
(
'Lock'
)
end
end
scenario
'Managing of lock list'
do
create
:path_lock
,
path:
'encoding'
,
user:
user
,
project:
project
...
...
This diff is collapsed.
Click to expand it.
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