Skip to content

GitLab Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • See what's new at GitLab
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
GitLab
GitLab
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 34,392
    • Issues 34,392
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge Requests 1,158
    • Merge Requests 1,158
  • Requirements
    • Requirements
    • List
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Security & Compliance
    • Security & Compliance
    • Dependency List
    • License Compliance
  • Operations
    • Operations
    • Metrics
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • GitLab.org
  • GitLabGitLab
  • Merge Requests
  • !440

You need to sign in or sign up before continuing.
Merged
Opened Jun 06, 2016 by Valery Sizov@vsizovMaintainer21 of 21 tasks completed21/21 tasks

File Lock

  • Overview 147
  • Commits 1
  • Pipelines 1
  • Changes 35

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/497

  • Data layer(tables, models, migrations)
  • Checks on git push
  • Author should be able to push if one owns the lock
  • Path matcher with tokenizer and memoization
  • Show lock status icons by files and folders
  • UI: mockup buttons for locking files, folders
  • UI: Locking files
  • UI: Locking folders
  • Permissions check everywhere
  • Add page to list all locked files/dirs to get overview in case people forget to unlock
  • Refactor lock_file_button and lock_file_link
  • Testing Git LFS
  • Get rid of code duplication in pre-receive hook
  • Test case: I want to unlock file if I'm a developer and I'm not an author of lock
  • Make it EE option
  • Specs and spinach
  • TODOs in the code

Can be moved to the next iteration:

  • Fix Web UI lock check(!487 (merged))
  • timeago in the lock icon tooltip. It's not working out of the box(#704)
  • Ajax load bar on click "Lock/Unlock" in the file tree (#698 (closed))
  • Nested locking UI. If we look at file and it's locked because of parent we should show it in tooltip. (#705 (closed))

Screenshots

joxi_screenshot_1466188707474joxi_screenshot_1466188735083joxi_screenshot_1466188758950

Related info: Douwe wrote: For a next iteration, we need to think about nested locking more. If user A has locked lib/, user B shouldn't be able to lock lib/foo.rb since that falls under lib/. Similarly, if user A has locked lib/foo.rb, user B shouldn't be able to lock lib/, because part of that directory is locked by someone else already.

Assignee
Assign to
Reviewer
Request review from
8.9
Milestone
8.9 (Past due)
Assign milestone
Time tracking
Reference: gitlab-org/gitlab!440
Source branch: file_locks

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.