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
8cc5e855
Commit
8cc5e855
authored
Apr 03, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mention protected branch force push
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
53504928
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/protected_branches/index.html.haml
app/views/projects/protected_branches/index.html.haml
+1
-0
No files found.
CHANGELOG
View file @
8cc5e855
...
@@ -7,6 +7,7 @@ v 6.8.0
...
@@ -7,6 +7,7 @@ v 6.8.0
- Make the repository downloads path configurable
- Make the repository downloads path configurable
- Create branches via API (sponsored by O'Reilly Media)
- Create branches via API (sponsored by O'Reilly Media)
- Changed permission of gitlab-satellites directory not to be world accessible
- Changed permission of gitlab-satellites directory not to be world accessible
- Protected branch does not allow force push
v 6.7.3
v 6.7.3
- Fix the merge notification email not being sent (Pierre de La Morinerie)
- Fix the merge notification email not being sent (Pierre de La Morinerie)
...
...
app/views/projects/protected_branches/index.html.haml
View file @
8cc5e855
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
%ul
%ul
%li
keep stable branches secured
%li
keep stable branches secured
%li
forced code review before merge to protected branches
%li
forced code review before merge to protected branches
%li
prevents branch from force push
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"underlined-link"
}
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"underlined-link"
}
-
if
can?
current_user
,
:admin_project
,
@project
-
if
can?
current_user
,
:admin_project
,
@project
...
...
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