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
e3df2f6b
Commit
e3df2f6b
authored
Nov 15, 2017
by
Athar Hameed
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix docs to label file locking as EEP-only
parent
9c97a635
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
doc/README.md
doc/README.md
+1
-2
No files found.
doc/README.md
View file @
e3df2f6b
...
...
@@ -81,7 +81,7 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i
-
[
File templates
](
user/project/repository/web_editor.md#template-dropdowns
)
-
[
Create a directory
](
user/project/repository/web_editor.md#create-a-directory
)
-
[
Start a merge request
](
user/project/repository/web_editor.md#tips
)
(
when
committing via UI)
-
**(EE
S/EEP)**
[
Lock a file
](
user/project/file_lock.md
)
: Lock a file to avoid merge conflicts.
-
**(EE
P)**
[
File locking
](
user/project/file_lock.md
)
: Lock a file to avoid merge conflicts.
-
[
Branches
](
user/project/repository/branches/index.md
)
-
[
Default branch
](
user/project/repository/branches/index.md#default-branch
)
-
[
Create a branch
](
user/project/repository/web_editor.md#create-a-new-branch
)
...
...
@@ -91,7 +91,6 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i
-
[
Signing commits
](
user/project/repository/gpg_signed_commits/index.md
)
: use GPG to sign your commits.
-
**(EES/EEP)**
[
Repository Mirroring
](
workflow/repository_mirroring.md
)
-
**(EES/EEP)**
[
Push rules
](
push_rules/push_rules.md
)
: Additional control over pushes to your project.
-
**(EEP)**
[
File Locking
](
user/project/file_lock.md
)
: Lock a file to avoid merge conflicts.
### Issues and Merge Requests (MRs)
...
...
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