kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/projects/protected_branches/index.html.haml

21 lines
979 B
Text
Raw Normal View History

Add a page title to every page.
2015-04-30 13:06:18 -04:00
- page_title "Protected branches"
ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only
2012-02-15 15:02:33 -05:00
Protected branches UI Closes #14027
2016-04-26 10:50:31 -04:00
.row.prepend-top-default.append-bottom-default
.col-lg-3
%h4.prepend-top-0
= page_title
Improve the error message displayed when branch creation fails. Note: This feature was developed independently on master while this was in review. I've removed the conflicting bits and left the relevant additions, mainly a test for `Gitlab::Git::Hook`. The original commit message follows: 1. `gitlab-shell` outputs errors to `stderr`, but we weren't using this information, prior to this commit. Now we capture the `stderr`, and display it in the flash message when branch creation fails. 2. This can be used to display better errors for other git operation failures with small tweaks. 3. The return value of `Gitlab::Git::Hook#trigger` is changed from a simple `true`/`false` to a tuple of `[status, errors]`. All usages and tests have been updated to reflect this change. 4. This is only relevant to branch creation _from the Web UI_, since SSH and HTTP pushes access `gitlab-shell` either directly or through `gitlab-workhorse`. 5. A few minor changes need to be made on the `gitlab-shell` end. Right now, the `stderr` message it outputs is prefixed by "GitLab: ", which shows up in our flash message. This is better removed.
2016-06-17 01:51:17 -04:00
%p Keep stable branches secure and force developers to use merge requests.
%p.prepend-top-20
Refactor protected branches documentation
2016-07-22 03:56:25 -04:00
By default, protected branches are designed to:
Protected branches UI Closes #14027
2016-04-26 10:50:31 -04:00
%ul
Refactor protected branches documentation
2016-07-22 03:56:25 -04:00
%li prevent their creation, if not already created, from everybody except Masters
%li prevent pushes from everybody except Masters
%li prevent <strong>anyone</strong> from force pushing to the branch
%li prevent <strong>anyone</strong> from deleting the branch
%p.append-bottom-0 Read more about #{link_to "protected branches", help_page_path("user/project/protected_branches"), class: "underlined-link"} and #{link_to "project permissions", help_page_path("user/permissions"), class: "underlined-link"}.
Improve the error message displayed when branch creation fails. Note: This feature was developed independently on master while this was in review. I've removed the conflicting bits and left the relevant additions, mainly a test for `Gitlab::Git::Hook`. The original commit message follows: 1. `gitlab-shell` outputs errors to `stderr`, but we weren't using this information, prior to this commit. Now we capture the `stderr`, and display it in the flash message when branch creation fails. 2. This can be used to display better errors for other git operation failures with small tweaks. 3. The return value of `Gitlab::Git::Hook#trigger` is changed from a simple `true`/`false` to a tuple of `[status, errors]`. All usages and tests have been updated to reflect this change. 4. This is only relevant to branch creation _from the Web UI_, since SSH and HTTP pushes access `gitlab-shell` either directly or through `gitlab-workhorse`. 5. A few minor changes need to be made on the `gitlab-shell` end. Right now, the `stderr` message it outputs is prefixed by "GitLab: ", which shows up in our flash message. This is better removed.
2016-06-17 01:51:17 -04:00
.col-lg-9
Protected branches UI Closes #14027
2016-04-26 10:50:31 -04:00
- if can? current_user, :admin_project, @project
Update layout and JS for create protected branch. Also updates protect branch list
2016-08-01 17:08:36 -04:00
= render 'create_protected_branch'
ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only
2012-02-15 15:02:33 -05:00
Protected branches UI Closes #14027
2016-04-26 10:50:31 -04:00
= render "branches_list"
Copy permalink